fix: introduces expressionNames to improve check

geostyler · May 26, 2023 · 75922ed · 75922ed
1 parent 0fbe561
commit 75922ed
Showing 1 changed file with 83 additions and 1 deletion.
diff --git a/src/Expressions.ts b/src/Expressions.ts
@@ -13,6 +13,88 @@ import {
   StyleFunction
 } from 'mapbox-gl';
 
+const expressionNames: ExpressionName[] = ['array',
+  'boolean',
+  'collator',
+  'format',
+  'literal',
+  'number',
+  'number-format',
+  'object',
+  'string',
+  'image',
+  'to-boolean',
+  'to-color',
+  'to-number',
+  'to-string',
+  'typeof',
+  'feature-state',
+  'geometry-type',
+  'id',
+  'line-progress',
+  'properties',
+  'at',
+  'get',
+  'has',
+  'in',
+  'index-of',
+  'length',
+  'slice',
+  '!',
+  '!=',
+  '<',
+  '<=',
+  '==',
+  '>',
+  '>=',
+  'all',
+  'any',
+  'case',
+  'match',
+  'coalesce',
+  'within',
+  'interpolate',
+  'interpolate-hcl',
+  'interpolate-lab',
+  'step',
+  'let',
+  'var',
+  'concat',
+  'downcase',
+  'is-supported-script',
+  'resolved-locale',
+  'upcase',
+  'rgb',
+  'rgba',
+  'to-rgba',
+  '-',
+  '*',
+  '/',
+  '%',
+  '^',
+  '+',
+  'abs',
+  'acos',
+  'asin',
+  'atan',
+  'ceil',
+  'cos',
+  'e',
+  'floor',
+  'ln',
+  'ln2',
+  'log10',
+  'log2',
+  'max',
+  'min',
+  'pi',
+  'round',
+  'sin',
+  'sqrt',
+  'tan',
+  'zoom',
+  'heatmap-density'];
+
 const functionNameMap: Record<GeoStylerFunction['name'], ExpressionName | null> = {
   // ---- string ----
   numberFormat: null,
@@ -139,7 +221,7 @@ export function mb2gsExpression<T extends PropertyType>(mbExpression?: MbInput):
 
   // TODO: is this check valid ?
   // fails for arrays like offset = [10, 20]
-  if (!(Array.isArray(mbExpression) && mbExpression[0])) {
+  if (!(Array.isArray(mbExpression) && expressionNames.includes(mbExpression[0]))) {
     return mbExpression as GeoStylerExpression<T> | undefined;
   }