From be4b787e66c6d44a44e820423b8114729892ec76 Mon Sep 17 00:00:00 2001
From: dsehnal <david.sehnal@gmail.com>
Date: Wed, 11 Aug 2021 14:49:52 +0200
Subject: [PATCH] Fix mol-script query compiler const expression recognition
---
CHANGELOG.md | 4 ++++
src/mol-script/runtime/query/base.ts | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8818db11f..6efedab93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,11 @@ Note that since we don't clearly distinguish between a public and private interf
## [Unreleased]
+
+## [v2.2.2] - 2021-08-11
+
- Fix ``TransformData`` issues [#133](https://github.com/molstar/molstar/issues/133)
+- Fix ``mol-script`` query compiler const expression recognition.
## [v2.2.1] - 2021-08-02
diff --git a/src/mol-script/runtime/query/base.ts b/src/mol-script/runtime/query/base.ts
index bc645dab6..314d07e84 100644
--- a/src/mol-script/runtime/query/base.ts
+++ b/src/mol-script/runtime/query/base.ts
@@ -120,7 +120,7 @@ class SymbolRuntimeImpl<S extends MSymbol> implements QuerySymbolRuntime {
constArgs = true;
} else if (Expression.isArgumentsArray(inputArgs)) {
args = [];
- constArgs = false;
+ constArgs = true;
for (const arg of inputArgs) {
const compiled = _compile(ctx, arg);
constArgs = constArgs && compiled.isConst;
@@ -128,7 +128,7 @@ class SymbolRuntimeImpl<S extends MSymbol> implements QuerySymbolRuntime {
}
} else {
args = Object.create(null);
- constArgs = false;
+ constArgs = true;
for (const key of Object.keys(inputArgs)) {
const compiled = _compile(ctx, inputArgs[key]);
constArgs = constArgs && compiled.isConst;
--
GitLab