Fix expression handling for literals vs. instance names#565
Open
AntoineGautier wants to merge 12 commits into
Open
Fix expression handling for literals vs. instance names#565AntoineGautier wants to merge 12 commits into
AntoineGautier wants to merge 12 commits into
Conversation
The fix has two parts: 1. **`transformIgnorePatterns`** — overrides the default "ignore all of `node_modules`" rule, telling Jest it *should* transform uuid package. 2. **`babel-jest` transform + `babel.config.js`** — provides the actual transformer for `.js` files, using `@babel/preset-env` targeting the current Node version to convert ESM to CommonJS that Jest can consume.
Remove the `expandStringOperand` function and `evaluateExpression` calls. Expressions are now kept in their raw form (strings or objects) and only evaluated on the client side. This simplifies the server logic and allows the client to handle type resolution in its own context. Update type annotations to use `Expression | Literal` where applicable.
…v into ag/554-expr-literals
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes #554 and #564.
@JayHuLBL Please make sure staging is in sync with main before merging.
Dependencies
This includes #561, and should be merged after that PR.
Changes
Remove
"none"operator wrappingBare literals (booleans, numbers, unambiguous values) were unnecessarily wrapped as
{operator: "none", operands: [<value>]}. They are now stored directly:This applies to both
valuefields and modifierexpressionfields.templates.jsonshrinks by ~373 KB (~14%).Preserve Modelica string literal quoting
String literals from Modelica source (e.g.
"\"foo\""in modelica-json) are now stored with their surrounding double-quote characters intemplates.json(e.g."\"foo\""). This gives the client a reliable way to distinguish a literal string from an instance/variable name reference — previously indistinguishable.Client interpreter updated
resolveToValuenow handles the two string cases explicitly:JSON.parseto recover the plain literal ("\"foo\""→"foo")Server parser updated
getExpression/buildSimpleExpressionno longer emit"none"wrapper expressions. String values from modelica-json are forwarded directly; the quoting from Modelica string literals is preserved as-is.Testing
Unit tests have been included to validate the comparison with literal string assignment, where the literal string matches an instance name in the loaded context:
cd client && npx jest -t "Comparison with literal string assignment"End-to-end tests have also been performed by creating the SOO document with the following system options.
AHU
Cooling-only box
✅ The parameter dialogs are identical to the ones on main.
✅ The feature branch produces the same document as the main branch.