wip better support for dynamic name expressions in get/var

openlayers · Dec 8, 2023 · 4a95e95 · 4a95e95
1 parent b27dd70
commit 4a95e95
Show file tree

Hide file tree

Showing 5 changed files with 338 additions and 125 deletions.
diff --git a/src/ol/expr/expression.js b/src/ol/expr/expression.js
@@ -197,6 +197,20 @@ export class LiteralExpression {
   }
 }
 
+/**
+ * @param {Expression} expr Expression
+ * @return {boolean} Whether the expression relies on properties
+ */
+function checkReliesOnProperties(expr) {
+  if (expr instanceof LiteralExpression) {
+    return false;
+  }
+  if (expr.reliesOnProperties) {
+    return true;
+  }
+  return expr.args.some(checkReliesOnProperties);
+}
+
 export class CallExpression {
   /**
    * @param {number} type The return type.
@@ -207,6 +221,8 @@ export class CallExpression {
     this.type = type;
     this.operator = operator;
     this.args = args;
+    this.reliesOnProperties =
+      operator === 'get' || args.some(checkReliesOnProperties);
   }
 }