Support multiple extends clauses per class#566
Open
AntoineGautier wants to merge 14 commits into
Open
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
Replace single extend properties with extendsInfo array and provide backward-compatible getters.
Extends clause modifiers must only apply to parameters at the current level. Mutating the original modMap caused values to propagate into nested component scopes, creating self-referencing parameters. A separate localModMap is used for extractAttributes calls while preserving modMap for child component scopes.
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
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
Closes #507.
A Modelica class can have more than one
extendsclause, but the parser only handled a single one — other clauses were silently ignored. This PR fixes that and cleans up expression handling that was blocking the schedule builder from working correctly with these expanded classes.Dependencies
This includes #561 and #565, and should be merged after those PR.
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:
docker exec ctrl-flow sh -c 'cd /server && npx jest -t "Multiple extends clauses"'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.