Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

fix: Validate authored fragments against HTML content models (#5988)

Oleg Isonencf0e76f96a76
diff --git a/apps/builder/app/builder/features/settings-panel/request-inspector.test.tsx b/apps/builder/app/builder/features/settings-panel/request-inspector.test.tsx
index b19636cac8..6c649907f6 100644
--- a/apps/builder/app/builder/features/settings-panel/request-inspector.test.tsx
+++ b/apps/builder/app/builder/features/settings-panel/request-inspector.test.tsx
@@ -4,7 +4,10 @@
import { act } from "react-dom/test-utils";
import { createRoot, type Root } from "react-dom/client";
import { afterEach, expect, test, vi } from "vitest";
-import { RequestInspector } from "./request-inspector";
+import {
+ clearSettledDiagnosticsKey,
+ RequestInspector,
+} from "./request-inspector";
(
globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
@@ -18,6 +21,15 @@ afterEach(() => {
document.body.innerHTML = "";
});
+test("keeps the current diagnostics request pending when an older one settles", () => {
+ expect(clearSettledDiagnosticsKey("resource-b", "resource-a")).toBe(
+ "resource-b"
+ );
+ expect(clearSettledDiagnosticsKey("resource-b", "resource-b")).toBe(
+ undefined
+ );
+});
+
const renderInspector = (
query: boolean,
queryContainerRef: (element: HTMLDivElement | null) => void = () => {},
@@ -64,11 +76,43 @@ test("loads diagnostics when their tab is opened", () => {
container.querySelectorAll<HTMLElement>('[role="tab"]')
).find(({ textContent }) => textContent === "Diagnostics");
- act(() => diagnostics?.click());
+ act(() => {
+ diagnostics?.dispatchEvent(
+ new MouseEvent("mousedown", { bubbles: true, button: 0 })
+ );
+ diagnostics?.click();
+ });
expect(onDiagnosticsOpen).toHaveBeenCalledOnce();
});
+test("shows when diagnostics are loading", () => {
+ const container = document.createElement("div");
+ document.body.appendChild(container);
+ root = createRoot(container);
+ act(() => {
+ root?.render(
+ <RequestInspector
+ preview={<div>Preview content</div>}
+ diagnosticsPending
+ />
+ );
+ });
+ const diagnostics = Array.from(
+ container.querySelectorAll<HTMLElement>('[role="tab"]')
+ ).find(({ textContent }) => textContent === "Diagnostics");
+
+ act(() => {
+ diagnostics?.dispatchEvent(
+ new MouseEvent("mousedown", { bubbles: true, button: 0 })
+ );
+ diagnostics?.click();
+ });
+
+ expect(container.textContent).toContain("Loading diagnostics...");
+ expect(container.textContent).not.toContain("No diagnostics available");
+});
+
test("keeps preview first when no query editor is available", () => {
const container = renderInspector(false);
const tabs = Array.from(container.querySelectorAll('[role="tab"]'));
diff --git a/apps/builder/app/builder/features/settings-panel/request-inspector.tsx b/apps/builder/app/builder/features/settings-panel/request-inspector.tsx
index 1f418a17b5..0ff698b75b 100644
--- a/apps/builder/app/builder/features/settings-panel/request-inspector.tsx
+++ b/apps/builder/app/builder/features/settings-panel/request-inspector.tsx
@@ -13,6 +13,11 @@ import {
} from "@webstudio-is/design-system";
import { InfoCircleIcon } from "@webstudio-is/icons";
+export const clearSettledDiagnosticsKey = (
+ pendingKey: string | undefined,
+ settledKey: string
+) => (pendingKey === settledKey ? undefined : pendingKey);
+
export const RequestDiagnosticsContent = ({
children,
}: {
@@ -83,11 +88,13 @@ export const RequestInspector = ({
queryContainerRef,
preview,
diagnostics,
+ diagnosticsPending = false,
onDiagnosticsOpen,
}: {
queryContainerRef?: Ref<HTMLDivElement>;
preview: ReactNode;
diagnostics?: ReactNode;
+ diagnosticsPending?: boolean;
onDiagnosticsOpen?: () => void;
}) => (
<PanelTabs
@@ -139,7 +146,11 @@ export const RequestInspector = ({
>
{diagnostics ?? (
<Flex align="center" justify="center" css={{ height: "100%" }}>
- <Text color="moreSubtle">No diagnostics available</Text>
+ <Text color="moreSubtle">
+ {diagnosticsPending
+ ? "Loading diagnostics..."
+ : "No diagnostics available"}
+ </Text>
</Flex>
)}
</PanelTabsContent>
diff --git a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx b/apps/builder/app/builder/features/settings-panel/variable-popover.tsx
index 8e23c47e40..c703ebe4a6 100644
--- a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx
+++ b/apps/builder/app/builder/features/settings-panel/variable-popover.tsx
@@ -98,7 +98,10 @@ import {
} from "~/shared/resources";
import { Row } from "./shared";
import type { AssetQueryPreviewDiagnostics } from "@webstudio-is/content-engine";
-import { RequestInspector } from "./request-inspector";
+import {
+ clearSettledDiagnosticsKey,
+ RequestInspector,
+} from "./request-inspector";
import { ContentDatabaseDiagnostics } from "./content-database-diagnostics";
import {
getRequestErrorDiagnostics,
@@ -687,6 +690,7 @@ const VariablePreview = ({
queryActive: boolean;
queryContainerRef: (element: HTMLDivElement | null) => void;
}) => {
+ const [pendingDiagnosticsKey, setPendingDiagnosticsKey] = useState<string>();
const isResource =
variableType === "resource" ||
variableType === "graphql-resource" ||
@@ -700,6 +704,7 @@ const VariablePreview = ({
let computedValue: unknown;
let resourceDiagnostics: AssetQueryPreviewDiagnostics | undefined;
let computedResourceRequest: ResourceRequest | undefined;
+ let computedResourceKey: string | undefined;
if (variableType === "string" || variableType === "boolean") {
computedValue = variableValue;
} else if (variableType === "json") {
@@ -726,6 +731,7 @@ const VariablePreview = ({
if (parsedResourceRequest) {
computedResourceRequest = parsedResourceRequest;
const resourceKey = getResourceKey(parsedResourceRequest);
+ computedResourceKey = resourceKey;
computedValue = resourcesCache.get(resourceKey);
resourceDiagnostics = resourceDiagnosticsCache.get(resourceKey);
}
@@ -785,10 +791,21 @@ const VariablePreview = ({
isAssetsResourceRequest(computedResourceRequest) &&
resourceDiagnostics?.artifacts === undefined
? () => {
- void loadResourceDiagnostics(computedResourceRequest);
+ const diagnosticsKey = getResourceKey(computedResourceRequest);
+ setPendingDiagnosticsKey(diagnosticsKey);
+ void loadResourceDiagnostics(computedResourceRequest).finally(
+ () =>
+ setPendingDiagnosticsKey((pendingKey) =>
+ clearSettledDiagnosticsKey(pendingKey, diagnosticsKey)
+ )
+ );
}
: undefined
}
+ diagnosticsPending={
+ pendingDiagnosticsKey === computedResourceKey &&
+ resourceDiagnostics === undefined
+ }
diagnostics={
requestErrorDiagnostics !== undefined ? (
<RequestErrorDiagnostics value={requestErrorDiagnostics} />
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.ts
index 505801870a..d06a6ee903 100644
--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts
@@ -232,6 +232,7 @@ const insertPastedFragment = async ({
? pasteTarget.position
: undefined,
},
+ context: { allowLegacyContentModelWarnings: true },
});
const rootInstanceIds = result?.result.rootInstanceIds;
if (rootInstanceIds === undefined || rootInstanceIds.length === 0) {
diff --git a/apps/builder/app/shared/instance-utils/data.ts b/apps/builder/app/shared/instance-utils/data.ts
index 055e9f2f3a..eea941bb8a 100644
--- a/apps/builder/app/shared/instance-utils/data.ts
+++ b/apps/builder/app/shared/instance-utils/data.ts
@@ -10,7 +10,10 @@ import {
type BuilderRuntimeMutationOperationId,
type BuilderRuntimeOperationResult,
} from "@webstudio-is/project-build/runtime";
-import { builderRuntimeContext } from "@webstudio-is/project-build/runtime";
+import {
+ builderRuntimeContext,
+ type BuilderRuntimeContext,
+} from "@webstudio-is/project-build/runtime";
import { type BuilderRuntimeMutation } from "@webstudio-is/project-build/runtime";
import { $canOpenPageTemplates, $selectedPage } from "../nano-states";
import { createTransactionFromBuilderPatchPayload } from "../sync/builder-patch";
@@ -60,6 +63,11 @@ const getRuntimeMutationContext = () => ({
projectId: $project.get()?.id,
});
+type RuntimeMutationContext = Pick<
+ BuilderRuntimeContext,
+ "allowLegacyContentModelWarnings"
+>;
+
const requireSynchronousResult = <Result>(
id: BuilderRuntimeMutationOperationId,
result: Result | Promise<Result>
@@ -75,14 +83,16 @@ const createRuntimeMutationArgs = <
>({
id,
input,
+ context,
}: {
id: Id;
input: BuilderRuntimeOperationInput<Id>;
+ context?: RuntimeMutationContext;
}) => ({
id,
state: getWebstudioData(),
input,
- context: getRuntimeMutationContext(),
+ context: { ...getRuntimeMutationContext(), ...context },
});
const commitRuntimeMutation = <Mutation extends BuilderRuntimeMutation>(
@@ -100,9 +110,11 @@ export const executeRuntimeMutation = <
>({
id,
input,
+ context,
}: {
id: Id;
input: BuilderRuntimeOperationInput<Id>;
+ context?: RuntimeMutationContext;
}): RuntimeMutationResult<Id> | undefined => {
if (canCommitWebstudioData() === false) {
return;
@@ -111,7 +123,7 @@ export const executeRuntimeMutation = <
requireSynchronousResult(
id,
executeBuilderRuntimeOperation<RuntimeMutationResult<Id>>(
- createRuntimeMutationArgs({ id, input })
+ createRuntimeMutationArgs({ id, input, context })
)
)
);
@@ -145,16 +157,18 @@ export const executeRuntimeMutationAsync = async <
>({
id,
input,
+ context,
}: {
id: Id;
input: BuilderRuntimeOperationInput<Id>;
+ context?: RuntimeMutationContext;
}): Promise<RuntimeMutationResult<Id> | undefined> => {
if (canCommitWebstudioData() === false) {
return;
}
const result = await executeBuilderRuntimeOperation<
RuntimeMutationResult<Id>
- >(createRuntimeMutationArgs({ id, input }));
+ >(createRuntimeMutationArgs({ id, input, context }));
return commitRuntimeMutation(result);
};
diff --git a/apps/builder/app/shared/instance-utils/insert.test.tsx b/apps/builder/app/shared/instance-utils/insert.test.tsx
index 324ce86d84..397190b9d8 100644
--- a/apps/builder/app/shared/instance-utils/insert.test.tsx
+++ b/apps/builder/app/shared/instance-utils/insert.test.tsx
@@ -450,6 +450,34 @@ describe("insert webstudio fragment at", () => {
);
});
+ test("allows legacy fragment warnings through the internal paste context", async () => {
+ $pages.set(
+ createDefaultPages({ homePageId: "homePageId", rootInstanceId: "bodyId" })
+ );
+ selectPage("homePageId");
+ $instances.set(renderData(<$.Body ws:id="bodyId"></$.Body>).instances);
+ const onContentModelWarnings = vi.fn();
+
+ const inserted = insertWebstudioFragmentAt(
+ renderTemplate(
+ <ws.element ws:id="button" ws:tag="button">
+ <ws.element ws:id="heading" ws:tag="h3" />
+ </ws.element>
+ ),
+ { parentSelector: ["bodyId"], position: "end" },
+ undefined,
+ { allowContentModelWarnings: true, onContentModelWarnings }
+ );
+
+ expect(inserted).toBe(true);
+ expect($instances.get().get("bodyId")?.children).toHaveLength(1);
+ expect(onContentModelWarnings).toHaveBeenCalledWith([
+ expect.objectContaining({
+ message: "Placing <h3> element inside a <button> violates HTML spec.",
+ }),
+ ]);
+ });
+
test("returns false for empty fragments", async () => {
expect(await insertWebstudioFragmentAt(createFragment({}))).toBe(false);
});
diff --git a/apps/builder/app/shared/instance-utils/insert.ts b/apps/builder/app/shared/instance-utils/insert.ts
index e6f839386c..e65cdb4a7c 100644
--- a/apps/builder/app/shared/instance-utils/insert.ts
+++ b/apps/builder/app/shared/instance-utils/insert.ts
@@ -209,6 +209,9 @@ export const insertWebstudioFragmentAt = (
contentMode: options?.contentMode,
insertIndex: target.insertIndex,
},
+ context: {
+ allowLegacyContentModelWarnings: options?.allowContentModelWarnings,
+ },
});
const newInstanceId = result?.result.rootInstanceIds[0];
if (result !== undefined && newInstanceId !== undefined) {
diff --git a/packages/asset-uploader/src/revision.test.ts b/packages/asset-uploader/src/revision.test.ts
index fb5e409a01..72c8d508be 100644
--- a/packages/asset-uploader/src/revision.test.ts
+++ b/packages/asset-uploader/src/revision.test.ts
@@ -118,14 +118,17 @@ describe("asset content revisions", () => {
});
return empty({ status: 201 });
}),
- db.get("File", () =>
- json({
+ db.get("File", ({ request }) => {
+ const url = new URL(request.url);
+ expect(url.searchParams.has("updatedAt")).toBe(true);
+ expect(url.searchParams.has("createdAt")).toBe(false);
+ return json({
...oldFile,
name: revisionName,
format: "file",
status: "UPLOADING",
- })
- ),
+ });
+ }),
db.patch("File", () =>
json({
...oldFile,
diff --git a/packages/asset-uploader/src/upload.ts b/packages/asset-uploader/src/upload.ts
index a41bfe2916..eff6c4b414 100644
--- a/packages/asset-uploader/src/upload.ts
+++ b/packages/asset-uploader/src/upload.ts
@@ -394,7 +394,7 @@ export const uploadFileData = async (
.eq("name", name)
.eq("status", "UPLOADING")
.gt(
- "createdAt",
+ "updatedAt",
new Date(Date.now() - UPLOADING_STALE_TIMEOUT).toISOString()
)
.single();
diff --git a/packages/project-build/src/runtime/components.test.ts b/packages/project-build/src/runtime/components.test.ts
index 0b8d26c131..57c6b4b1e8 100644
--- a/packages/project-build/src/runtime/components.test.ts
+++ b/packages/project-build/src/runtime/components.test.ts
@@ -591,6 +591,97 @@ test("rejects invalid HtmlEmbed code from externally authored fragments", async
).toThrow("Entered HTML has a validation error");
});
+test("rejects fragment trees that violate the HTML content model", async () => {
+ const parent = createParent();
+ const fragment = await parseWebstudioJsxFragment(
+ `<ws.element ws:tag="a"><ws.element ws:tag="span"><ws.element ws:tag="a">Nested link</ws.element></ws.element></ws.element>`
+ );
+
+ expect(() =>
+ insertFragment(
+ createState(parent),
+ { parentInstanceId: parent.id, fragment },
+ { createId: createIdFactory() }
+ )
+ ).toThrow("Placing <a> element inside a <span> violates HTML spec.");
+});
+
+test("rejects fragments that violate the destination HTML content model", async () => {
+ const parent: Instance = {
+ ...createParent(),
+ tag: "a",
+ };
+ const root: Instance = {
+ ...createParent(),
+ id: "root",
+ tag: "body",
+ children: [{ type: "id", value: parent.id }],
+ };
+ const state = createState(root);
+ state.instances.set(parent.id, parent);
+ const fragment = await parseWebstudioJsxFragment(
+ `<ws.element ws:tag="span"><ws.element ws:tag="button">Action</ws.element></ws.element>`
+ );
+
+ expect(() =>
+ insertFragment(
+ state,
+ { parentInstanceId: parent.id, fragment },
+ { createId: createIdFactory() }
+ )
+ ).toThrow("Placing <button> element inside a <span> violates HTML spec.");
+});
+
+test("allows legacy invalid fragments when warnings are explicitly enabled", async () => {
+ const parent = createParent();
+ const fragment = await parseWebstudioJsxFragment(
+ `<ws.element ws:tag="button"><ws.element ws:tag="h3">Legacy heading</ws.element></ws.element>`
+ );
+
+ const mutation = insertFragment(
+ createState(parent),
+ {
+ parentInstanceId: parent.id,
+ fragment,
+ },
+ {
+ createId: createIdFactory(),
+ allowLegacyContentModelWarnings: true,
+ }
+ );
+
+ expect(mutation.result.rootInstanceIds).toEqual(["generated-0"]);
+});
+
+test("rejects new placement violations while allowing legacy fragment warnings", async () => {
+ const parent: Instance = {
+ ...createParent(),
+ tag: "a",
+ };
+ const root: Instance = {
+ ...createParent(),
+ id: "root",
+ tag: "body",
+ children: [{ type: "id", value: parent.id }],
+ };
+ const state = createState(root);
+ state.instances.set(parent.id, parent);
+ const fragment = await parseWebstudioJsxFragment(
+ `<ws.element ws:tag="button"><ws.element ws:tag="h3">Legacy heading</ws.element></ws.element>`
+ );
+
+ expect(() =>
+ insertFragment(
+ state,
+ { parentInstanceId: parent.id, fragment },
+ {
+ createId: createIdFactory(),
+ allowLegacyContentModelWarnings: true,
+ }
+ )
+ ).toThrow("Placing <button> element inside a <a> violates HTML spec.");
+});
+
test("rejects tag when inserting non-element component", async () => {
const parent = createParent();
diff --git a/packages/project-build/src/runtime/components.ts b/packages/project-build/src/runtime/components.ts
index f83276f853..a1c9541d3c 100644
--- a/packages/project-build/src/runtime/components.ts
+++ b/packages/project-build/src/runtime/components.ts
@@ -61,6 +61,10 @@ import { getSlotFragmentDropTargetMutable } from "./slot";
import type { ConflictResolution } from "./style-copy";
import { findPageAndSelectorByInstanceId } from "./lookup";
import { validateFragmentHtmlEmbedCode } from "./html-embed";
+import {
+ getFragmentPlacementContentModelWarnings,
+ getNewFragmentContentModelWarnings,
+} from "./matcher";
import { z } from "zod";
const conflictResolutionInput = z.enum(["ours", "theirs", "merge"]);
@@ -673,6 +677,7 @@ const createInsertFragmentMutation = <
contentMode = false,
additionalAvailableVariables = [],
getResultDetails,
+ validateContentModel = true,
context,
}: {
state: ComponentInsertState;
@@ -688,6 +693,7 @@ const createInsertFragmentMutation = <
newInstanceIds: Map<string, string>;
newDataSourceIds: Map<string, string>;
}) => Details;
+ validateContentModel?: boolean;
context: BuilderRuntimeContext;
}) => {
const mutationState = getRequiredComponentInsertState(state);
@@ -772,6 +778,51 @@ const createInsertFragmentMutation = <
return child;
}
);
+
+ if (validateContentModel) {
+ const validationInstances = new Map(nextData.instances);
+ const validationParent: Instance = {
+ ...parent,
+ children:
+ mode === "replace"
+ ? insertedChildren
+ : [
+ ...parentChildren.slice(0, insertIndex),
+ ...insertedChildren,
+ ...parentChildren.slice(insertIndex),
+ ],
+ };
+ validationInstances.set(parent.id, validationParent);
+ const { instanceSelector: parentSelector } =
+ findPageAndSelectorByInstanceId(
+ mutationState.pages,
+ validationInstances,
+ parent.id
+ );
+ const allowedWarnings = context.allowLegacyContentModelWarnings
+ ? getFragmentPlacementContentModelWarnings({
+ children: insertedChildren,
+ instances: validationInstances,
+ props: nextData.props,
+ metas: componentMetas,
+ })
+ : [];
+ const warnings = getFragmentPlacementContentModelWarnings({
+ children: insertedChildren,
+ instances: validationInstances,
+ props: nextData.props,
+ metas: componentMetas,
+ parentSelector,
+ });
+ const [contentModelError] = getNewFragmentContentModelWarnings({
+ warnings,
+ allowedWarnings,
+ });
+ if (contentModelError !== undefined) {
+ return throwBuilderRuntimeError("BAD_REQUEST", contentModelError.message);
+ }
+ }
+
const createResult = (
parentInstanceId: string,
removedInstanceIds: string[]
@@ -939,6 +990,7 @@ export const insertComponent = (
templates,
mode: input.mode,
insertIndex: input.insertIndex,
+ validateContentModel: false,
context,
});
};
diff --git a/packages/project-build/src/runtime/context.ts b/packages/project-build/src/runtime/context.ts
index a142ac0732..bf10251f6f 100644
--- a/packages/project-build/src/runtime/context.ts
+++ b/packages/project-build/src/runtime/context.ts
@@ -4,6 +4,7 @@ export type BuilderRuntimeContext = {
createId: () => string;
projectId?: string;
projectVersion?: number;
+ allowLegacyContentModelWarnings?: boolean;
};
export const builderRuntimeContext: BuilderRuntimeContext = {
diff --git a/packages/project-build/src/runtime/matcher.ts b/packages/project-build/src/runtime/matcher.ts
index b1b8441154..353f3a2041 100644
--- a/packages/project-build/src/runtime/matcher.ts
+++ b/packages/project-build/src/runtime/matcher.ts
@@ -15,19 +15,21 @@ export type FragmentContentModelWarning = {
const getWarningKey = ({ instanceId, message }: FragmentContentModelWarning) =>
`${instanceId}\0${message}`;
-export const getFragmentContentModelWarnings = ({
- fragment,
+export const getFragmentPlacementContentModelWarnings = ({
+ children,
+ instances,
+ props,
metas,
+ parentSelector = [],
}: {
- fragment: Pick<WebstudioFragment, "children" | "instances" | "props">;
+ children: WebstudioFragment["children"];
+ instances: Instances;
+ props: Props;
metas: Map<string, WsComponentMeta>;
+ parentSelector?: Instance["id"][];
}): FragmentContentModelWarning[] => {
- const instances: Instances = new Map(
- fragment.instances.map((instance) => [instance.id, instance])
- );
- const props: Props = new Map(fragment.props.map((prop) => [prop.id, prop]));
const warnings = new Map<string, FragmentContentModelWarning>();
- for (const child of fragment.children) {
+ for (const child of children) {
if (child.type !== "id") {
continue;
}
@@ -35,7 +37,7 @@ export const getFragmentContentModelWarnings = ({
instances,
props,
metas,
- instanceSelector: [child.value],
+ instanceSelector: [child.value, ...parentSelector],
onError: (message, instanceSelector) => {
const warning = { message, instanceId: instanceSelector[0] };
warnings.set(getWarningKey(warning), warning);
@@ -45,6 +47,38 @@ export const getFragmentContentModelWarnings = ({
return Array.from(warnings.values());
};
+export const getNewFragmentContentModelWarnings = ({
+ warnings,
+ allowedWarnings,
+}: {
+ warnings: FragmentContentModelWarning[];
+ allowedWarnings: FragmentContentModelWarning[];
+}) => {
+ const allowedWarningKeys = new Set(allowedWarnings.map(getWarningKey));
+ return warnings.filter(
+ (warning) => allowedWarningKeys.has(getWarningKey(warning)) === false
+ );
+};
+
+export const getFragmentContentModelWarnings = ({
+ fragment,
+ metas,
+}: {
+ fragment: Pick<WebstudioFragment, "children" | "instances" | "props">;
+ metas: Map<string, WsComponentMeta>;
+}): FragmentContentModelWarning[] => {
+ const instances: Instances = new Map(
+ fragment.instances.map((instance) => [instance.id, instance])
+ );
+ const props: Props = new Map(fragment.props.map((prop) => [prop.id, prop]));
+ return getFragmentPlacementContentModelWarnings({
+ children: fragment.children,
+ instances,
+ props,
+ metas,
+ });
+};
+
export const findClosestInstanceMatchingFragment = ({
instances,
props,
@@ -70,11 +104,9 @@ export const findClosestInstanceMatchingFragment = ({
for (const prop of fragment.props) {
mergedProps.set(prop.id, prop);
}
- const allowedWarningKeys = new Set(
- allowFragmentContentModelWarnings
- ? getFragmentContentModelWarnings({ fragment, metas }).map(getWarningKey)
- : []
- );
+ const allowedWarnings = allowFragmentContentModelWarnings
+ ? getFragmentContentModelWarnings({ fragment, metas })
+ : [];
let firstError = "";
for (let index = 0; index < instanceSelector.length; index += 1) {
const instanceId = instanceSelector[index];
@@ -86,33 +118,19 @@ export const findClosestInstanceMatchingFragment = ({
if (meta === undefined) {
continue;
}
- let matches = true;
- for (const child of fragment.children) {
- if (child.type !== "id") {
- continue;
- }
- let hasNewViolation = false;
- const isValid = isTreeSatisfyingContentModel({
- instances: mergedInstances,
- props: mergedProps,
- metas,
- instanceSelector: [child.value, ...instanceSelector.slice(index)],
- onError: (message, errorSelector) => {
- if (firstError === "") {
- firstError = message;
- }
- if (
- allowedWarningKeys.has(
- getWarningKey({ instanceId: errorSelector[0], message })
- ) === false
- ) {
- hasNewViolation = true;
- }
- },
- });
- matches &&= isValid || hasNewViolation === false;
- }
- if (matches) {
+ const warnings = getFragmentPlacementContentModelWarnings({
+ children: fragment.children,
+ instances: mergedInstances,
+ props: mergedProps,
+ metas,
+ parentSelector: instanceSelector.slice(index),
+ });
+ firstError ||= warnings[0]?.message ?? "";
+ const newWarnings = getNewFragmentContentModelWarnings({
+ warnings,
+ allowedWarnings,
+ });
+ if (newWarnings.length === 0) {
return index;
}
}