@nextgis/ngw-map 1.18.10 → 1.18.11

package/lib/ngw-map.esm-bundler.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.18.10; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.18.11; author: NextGIS */
 import { EventEmitter } from 'events';
 import CancelablePromise from '@nextgis/cancelable-promise';
 import { deepmerge, deprecatedWarn, defined, isObject, getIdentifyRadius } from '@nextgis/utils';

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.18.10; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.18.11; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
@@ -1421,6 +1421,37 @@ var NgwMap = (function (exports) {
         }
         return value;
     };
+    function typeOfValue(value) {
+        if (value === null)
+            return 'null';
+        switch (typeof value) {
+            case 'string':
+                return 'string';
+            case 'number':
+                return 'number';
+            case 'boolean':
+                return 'boolean';
+            case 'object':
+                if (Array.isArray(value)) {
+                    var arrayType = 'value';
+                    if (value.every(function (item) { return typeof item === 'number'; })) {
+                        arrayType = 'number';
+                    }
+                    else if (value.every(function (item) { return typeof item === 'string'; })) {
+                        arrayType = 'string';
+                    }
+                    else if (value.every(function (item) { return typeof item === 'boolean'; })) {
+                        arrayType = 'boolean';
+                    }
+                    return "array<".concat(arrayType, ", ").concat(value.length, ">");
+                }
+                else {
+                    return 'object';
+                }
+            default:
+                return 'undefined';
+        }
+    }
     var typeExpressions = {
         array: evaluateArgs(array),
         boolean: evaluateArgs(fallback(function (arg) { return (typeof arg === 'boolean' ? arg : undefined); })),
@@ -1440,7 +1471,7 @@ var NgwMap = (function (exports) {
         'to-string': evaluateArgs(fallback(String)),
         typeof: evaluateArgs(function (_a) {
             var arg = _a[0];
-            return typeof arg;
+            return typeOfValue(arg);
         }),
     };
 
@@ -1546,42 +1577,39 @@ var NgwMap = (function (exports) {
         var expr = _a[0];
         return !expr;
     }
-    var checkCompareValues = function (_a) {
-        var a = _a[0], b = _a[1];
-        if (typeof a !== typeof b) {
-            throw new Error('Values have different types.');
-        }
-    };
     function notEqual(_a) {
         var a = _a[0], b = _a[1];
-        checkCompareValues([a, b]);
         return a !== b;
     }
     function lessThan(_a) {
         var left = _a[0], right = _a[1];
-        checkCompareValues([left, right]);
         return left < right;
     }
     function lessThanOrEqual(_a) {
         var left = _a[0], right = _a[1];
-        checkCompareValues([left, right]);
         return left <= right;
     }
     function equal(_a) {
         var left = _a[0], right = _a[1];
-        checkCompareValues([left, right]);
         return left === right;
     }
     function greaterThan(_a) {
         var left = _a[0], right = _a[1];
-        checkCompareValues([left, right]);
         return left > right;
     }
     function greaterThanOrEqual(_a) {
         var left = _a[0], right = _a[1];
-        checkCompareValues([left, right]);
         return left >= right;
     }
+    var coalesce = function (args) {
+        for (var i = 0; i < args.length; i++) {
+            var arg = args[i]();
+            if (arg !== null && arg !== undefined) {
+                return arg;
+            }
+        }
+        return null;
+    };
     var all = function (args) {
         for (var i = 0; i < args.length; i++) {
             var arg = args[i]();
@@ -1638,6 +1666,7 @@ var NgwMap = (function (exports) {
         '==': evaluateArgs(equal),
         '>': evaluateArgs(greaterThan),
         '>=': evaluateArgs(greaterThanOrEqual),
+        coalesce: coalesce,
         all: all,
         any: any,
         case: caseFunc,