@nextgis/ngw-map 1.18.10 → 1.18.11

package/lib/ngw-map.cjs.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 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/lib/ngw-map.esm-browser.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 events = {exports: {}};
 
 var R = typeof Reflect === 'object' ? Reflect : null;
@@ -1247,6 +1247,37 @@ const array = (args) => {
     }
     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)) {
+                let arrayType = 'value';
+                if (value.every((item) => typeof item === 'number')) {
+                    arrayType = 'number';
+                }
+                else if (value.every((item) => typeof item === 'string')) {
+                    arrayType = 'string';
+                }
+                else if (value.every((item) => typeof item === 'boolean')) {
+                    arrayType = 'boolean';
+                }
+                return `array<${arrayType}, ${value.length}>`;
+            }
+            else {
+                return 'object';
+            }
+        default:
+            return 'undefined';
+    }
+}
 const typeExpressions = {
     array: evaluateArgs(array),
     boolean: evaluateArgs(fallback((arg) => (typeof arg === 'boolean' ? arg : undefined))),
@@ -1259,7 +1290,7 @@ const typeExpressions = {
     'to-boolean': evaluateArgs(fallback(Boolean)),
     'to-number': evaluateArgs(fallback(Number)),
     'to-string': evaluateArgs(fallback(String)),
-    typeof: evaluateArgs(([arg]) => typeof arg),
+    typeof: evaluateArgs(([arg]) => typeOfValue(arg)),
 };
 
 const mathExpressions = {
@@ -1357,35 +1388,33 @@ const stringExpressions = {
 function not([expr]) {
     return !expr;
 }
-const checkCompareValues = ([a, b]) => {
-    if (typeof a !== typeof b) {
-        throw new Error('Values have different types.');
-    }
-};
 function notEqual([a, b]) {
-    checkCompareValues([a, b]);
     return a !== b;
 }
 function lessThan([left, right]) {
-    checkCompareValues([left, right]);
     return left < right;
 }
 function lessThanOrEqual([left, right]) {
-    checkCompareValues([left, right]);
     return left <= right;
 }
 function equal([left, right]) {
-    checkCompareValues([left, right]);
     return left === right;
 }
 function greaterThan([left, right]) {
-    checkCompareValues([left, right]);
     return left > right;
 }
 function greaterThanOrEqual([left, right]) {
-    checkCompareValues([left, right]);
     return left >= right;
 }
+const coalesce = (args) => {
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i]();
+        if (arg !== null && arg !== undefined) {
+            return arg;
+        }
+    }
+    return null;
+};
 const all = (args) => {
     for (let i = 0; i < args.length; i++) {
         const arg = args[i]();
@@ -1442,6 +1471,7 @@ const decisionExpressions = {
     '==': evaluateArgs(equal),
     '>': evaluateArgs(greaterThan),
     '>=': evaluateArgs(greaterThanOrEqual),
+    coalesce,
     all,
     any,
     case: caseFunc,