Skip to content

fix: optimize saving global variables #4936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 1, 2025
Merged

fix: optimize saving global variables #4936

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions apps/builder/app/shared/data-variables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,7 @@ export const computeExpression = (
}
};

const findMaskedVariablesByInstanceId = ({
startingInstanceId,
instances,
dataSources,
}: {
startingInstanceId: Instance["id"];
instances: Instances;
dataSources: DataSources;
}) => {
const getParentInstanceById = (instances: Instances) => {
const parentInstanceById = new Map<Instance["id"], Instance["id"]>();
for (const instance of instances.values()) {
// interrupt lookup because slot variables cannot be passed to slot content
Expand All @@ -210,6 +202,18 @@ const findMaskedVariablesByInstanceId = ({
}
}
}
return parentInstanceById;
};

const findMaskedVariablesByInstanceId = ({
startingInstanceId,
parentInstanceById,
dataSources,
}: {
startingInstanceId: Instance["id"];
parentInstanceById: Map<Instance["id"], Instance["id"]>;
dataSources: DataSources;
}) => {
let currentId: undefined | string = startingInstanceId;
const instanceIdsPath: Instance["id"][] = [];
while (currentId) {
Expand Down Expand Up @@ -244,7 +248,7 @@ export const findAvailableVariables = ({
}) => {
const maskedVariables = findMaskedVariablesByInstanceId({
startingInstanceId,
instances,
parentInstanceById: getParentInstanceById(instances),
dataSources,
});
const availableVariables: DataSource[] = [];
Expand Down Expand Up @@ -486,6 +490,8 @@ export const rebindTreeVariablesMutable = ({
for (const dataSource of dataSources.values()) {
unsetNameById.set(dataSource.id, dataSource.name);
}
// precompute parent instances outside of traverse
const parentInstanceById = getParentInstanceById(instances);
traverseExpressions({
startingInstanceId,
pages,
Expand All @@ -497,8 +503,8 @@ export const rebindTreeVariablesMutable = ({
// restore all masked variables of current scope
const maskedVariables = findMaskedVariablesByInstanceId({
startingInstanceId: instanceId,
parentInstanceById,
dataSources,
instances,
});
let maskedIdByName = new Map(maskedVariables);
if (args) {
Expand Down Expand Up @@ -537,7 +543,7 @@ export const deleteVariableMutable = (
const startingInstanceId = dataSource.scopeInstanceId ?? "";
const maskedIdByName = findMaskedVariablesByInstanceId({
startingInstanceId,
instances: data.instances,
parentInstanceById: getParentInstanceById(data.instances),
dataSources: data.dataSources,
});
// unset deleted variable in expressions
Expand Down