Skip to content

fix: allow broken variables when validate updates #4892

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 2 commits into from
Feb 18, 2025
Merged

fix: allow broken variables when validate updates #4892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65547af
fix: allow broken variables when validate updates
TrySound Feb 18, 2025
1aeee18
Update packages/sdk/src/schema/data-sources.ts
TrySound Feb 18, 2025
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
7 changes: 4 additions & 3 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 @@ -312,7 +312,7 @@ const traverseExpressions = ({

for (const dataSource of dataSources.values()) {
if (
instanceIds.has(dataSource.scopeInstanceId) &&
instanceIds.has(dataSource.scopeInstanceId ?? "") &&
dataSource.type === "resource"
) {
resourceIds.add(dataSource.resourceId);
Expand Down Expand Up @@ -440,15 +440,16 @@ export const deleteVariableMutable = (
}
const unsetNameById = new Map<DataSource["id"], DataSource["name"]>();
unsetNameById.set(dataSource.id, dataSource.name);
const startingInstanceId = dataSource.scopeInstanceId ?? "";
const maskedIdByName = findMaskedVariablesByInstanceId({
startingInstanceId: dataSource.scopeInstanceId,
startingInstanceId,
instances: data.instances,
dataSources: data.dataSources,
});
// unset deleted variable in expressions
traverseExpressions({
...data,
startingInstanceId: dataSource.scopeInstanceId,
startingInstanceId,
update: (expression) => {
expression = unsetExpressionVariables({
expression,
Expand Down
8 changes: 4 additions & 4 deletions apps/builder/app/shared/instance-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ export const deleteInstanceMutable = (
}
}
for (const dataSource of dataSources.values()) {
if (instanceIds.has(dataSource.scopeInstanceId)) {
if (instanceIds.has(dataSource.scopeInstanceId ?? "")) {
dataSources.delete(dataSource.id);
if (dataSource.type === "resource") {
resources.delete(dataSource.resourceId);
Expand Down Expand Up @@ -605,7 +605,7 @@ export const extractWebstudioFragment = (
const fragmentResourceIds = new Set<Resource["id"]>();
const unsetNameById = new Map<DataSource["id"], DataSource["name"]>();
for (const dataSource of dataSources.values()) {
if (fragmentInstanceIds.has(dataSource.scopeInstanceId)) {
if (fragmentInstanceIds.has(dataSource.scopeInstanceId ?? "")) {
fragmentDataSources.set(dataSource.id, dataSource);
if (dataSource.type === "resource") {
fragmentResourceIds.add(dataSource.resourceId);
Expand Down Expand Up @@ -866,7 +866,7 @@ export const insertWebstudioFragmentCopy = ({
const usedResourceIds = new Set<Resource["id"]>();
for (const dataSource of fragment.dataSources) {
// insert only data sources within portal content
if (instanceIds.has(dataSource.scopeInstanceId)) {
if (instanceIds.has(dataSource.scopeInstanceId ?? "")) {
dataSources.set(dataSource.id, dataSource);
if (dataSource.type === "resource") {
usedResourceIds.add(dataSource.resourceId);
Expand Down Expand Up @@ -956,7 +956,7 @@ export const insertWebstudioFragmentCopy = ({
}
const newResourceIds = new Map<Resource["id"], Resource["id"]>();
for (let dataSource of fragment.dataSources) {
const { scopeInstanceId } = dataSource;
const scopeInstanceId = dataSource.scopeInstanceId ?? "";
if (scopeInstanceId === ROOT_INSTANCE_ID) {
// add global variable only if not exist already
if (
Expand Down
11 changes: 8 additions & 3 deletions packages/sdk/src/schema/data-sources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,25 @@ export const DataSource = z.union([
z.object({
type: z.literal("variable"),
id: DataSourceId,
scopeInstanceId: z.string(),
// The instance should always be specified for variables,
// however, there was a bug in the embed template
// which produced variables without an instance
// and these variables will fail validation
// if we make it required
scopeInstanceId: z.string().optional(),
name: z.string(),
value: DataSourceVariableValue,
}),
z.object({
type: z.literal("parameter"),
id: DataSourceId,
scopeInstanceId: z.string(),
scopeInstanceId: z.string().optional(),
name: z.string(),
}),
z.object({
type: z.literal("resource"),
id: DataSourceId,
scopeInstanceId: z.string(),
scopeInstanceId: z.string().optional(),
name: z.string(),
resourceId: z.string(),
}),
Expand Down
Loading