mirror of
https://github.com/heygen-com/hyperframes.git
synced 2026-09-03 04:38:33 +00:00
fix(core): skip empty sub-composition files instead of aborting render (#1678)
This commit is contained in:
@@ -38,18 +38,27 @@ function makeHostDocument(compId: string) {
|
||||
}
|
||||
|
||||
describe("inlineSubCompositions – #ID selector scoping divergence", () => {
|
||||
it("throws an actionable error when a resolved sub-composition file is empty", () => {
|
||||
it.each([
|
||||
{ label: "empty", html: "" },
|
||||
{ label: "whitespace-only", html: " \n \t " },
|
||||
{
|
||||
label: "valid-parse-empty-body",
|
||||
html: "<!doctype html><html><head></head><body></body></html>",
|
||||
},
|
||||
])("skips $label sub-composition files gracefully", ({ html }) => {
|
||||
const document = makeHostDocument("intro");
|
||||
const host = document.querySelector('[data-composition-src="intro.html"]')!;
|
||||
const missing: string[] = [];
|
||||
|
||||
expect(() =>
|
||||
inlineSubCompositions(document, [host], {
|
||||
resolveHtml: () => "",
|
||||
parseHtml: (html) => parseHTML(html).document,
|
||||
}),
|
||||
).toThrow(
|
||||
"Composition HTML is empty or could not be parsed: intro.html. Check that the file referenced by data-composition-src contains valid HTML.",
|
||||
);
|
||||
const result = inlineSubCompositions(document, [host], {
|
||||
resolveHtml: () => html,
|
||||
parseHtml: (h) => parseHTML(h).document,
|
||||
onMissingComposition: (src) => missing.push(src),
|
||||
});
|
||||
|
||||
expect(missing).toEqual(["intro.html"]);
|
||||
expect(result.styles).toHaveLength(0);
|
||||
expect(result.scripts).toHaveLength(0);
|
||||
});
|
||||
|
||||
it("producer path (no flattenInnerRoot): strips inner root, losing #id attribute", () => {
|
||||
|
||||
@@ -125,24 +125,6 @@ function defaultBuildScopeSelector(compId: string): string {
|
||||
return `[data-composition-id="${escaped}"]`;
|
||||
}
|
||||
|
||||
function emptyCompositionHtmlError(src: string): Error {
|
||||
return new Error(
|
||||
`Composition HTML is empty or could not be parsed: ${src}. Check that the file referenced by data-composition-src contains valid HTML.`,
|
||||
);
|
||||
}
|
||||
|
||||
function assertNonEmptyCompositionHtml(html: string, src: string): void {
|
||||
if (!html.trim()) {
|
||||
throw emptyCompositionHtmlError(src);
|
||||
}
|
||||
}
|
||||
|
||||
function assertParsedCompositionDocument(doc: Document, src: string): void {
|
||||
if (!doc.documentElement) {
|
||||
throw emptyCompositionHtmlError(src);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Core implementation
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -194,16 +176,16 @@ export function inlineSubCompositions(
|
||||
if (!src) continue;
|
||||
|
||||
const compHtml = resolveHtml(src);
|
||||
if (compHtml == null) {
|
||||
if (onMissingComposition) {
|
||||
onMissingComposition(src);
|
||||
}
|
||||
if (compHtml == null || !compHtml.trim()) {
|
||||
onMissingComposition?.(src);
|
||||
continue;
|
||||
}
|
||||
|
||||
assertNonEmptyCompositionHtml(compHtml, src);
|
||||
const compDoc = parseHtml(compHtml);
|
||||
assertParsedCompositionDocument(compDoc, src);
|
||||
if (!compDoc.documentElement) {
|
||||
onMissingComposition?.(src);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Determine composition IDs
|
||||
let compId: string | null;
|
||||
@@ -220,9 +202,15 @@ export function inlineSubCompositions(
|
||||
// Find content: prefer <template>, fall back to <body>
|
||||
const contentRoot = compDoc.querySelector("template");
|
||||
const contentHtml = contentRoot ? contentRoot.innerHTML || "" : compDoc.body?.innerHTML || "";
|
||||
assertNonEmptyCompositionHtml(contentHtml, src);
|
||||
if (!contentHtml.trim()) {
|
||||
onMissingComposition?.(src);
|
||||
continue;
|
||||
}
|
||||
const contentDoc = parseHtml(contentHtml);
|
||||
assertParsedCompositionDocument(contentDoc, src);
|
||||
if (!contentDoc.documentElement) {
|
||||
onMissingComposition?.(src);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Find the inner composition root
|
||||
const innerRoot = compId
|
||||
|
||||
Reference in New Issue
Block a user