hyperframes 0.8.65 → 0.8.66

package/dist/fontLocalizeCli.js

@@ -52647,6 +52647,14 @@ var init_assetPaths = __esm({
 });
 
 // ../parsers/dist/subCompositionValidity.js
+function resolveSubCompositionContent(html, document2) {
+  const template = document2.querySelector("template");
+  if (template) return { contentHtml: template.innerHTML ?? "", hasTemplate: true };
+  const body = document2.querySelector("body");
+  if (body) return { contentHtml: body.innerHTML ?? "", hasTemplate: false };
+  const contentHtml = document2.querySelector("html") ? "" : html;
+  return { contentHtml, hasTemplate: false };
+}
 function checkSubCompositionUsability(html, parseHtml) {
   if (html == null || !html.trim()) {
     return {
@@ -52663,8 +52671,7 @@ function checkSubCompositionUsability(html, parseHtml) {
       detail: "the file's contents could not be parsed as HTML"
     };
   }
-  const contentRoot = compDoc.querySelector("template");
-  const contentHtml = contentRoot ? contentRoot.innerHTML || "" : compDoc.body?.innerHTML || "";
+  const { contentHtml } = resolveSubCompositionContent(html, compDoc);
   if (!contentHtml.trim()) {
     return {
       ok: false,
@@ -52677,14 +52684,14 @@ function checkSubCompositionUsability(html, parseHtml) {
     return {
       ok: false,
       reason: "unparsable",
-      detail: "the file's <template>/<body> contents could not be parsed as HTML"
+      detail: "the file's resolved contents could not be parsed as HTML"
     };
   }
   if (!contentDoc.querySelector("[data-composition-id]")) {
     return {
       ok: false,
       reason: "no-composition-root",
-      detail: "the file's <template>/<body> content has no element with a data-composition-id attribute"
+      detail: "the file's resolved content has no element with a data-composition-id attribute"
     };
   }
   return { ok: true };
@@ -65406,7 +65413,7 @@ async function fetchToPartial(url, partialPath, controller, options) {
   });
   const readableStream = Readable.fromWeb(response.body);
   const fileStream = createWriteStream(partialPath, { flags: "wx" });
-  await pipeline(readableStream, inspector, fileStream);
+  await pipeline(readableStream, inspector, fileStream, { signal: controller.signal });
   const localSize = statSync4(partialPath).size;
   const sha256Bytes = sha256.digest();
   const localSha256 = sha256Bytes.toString("hex");
@@ -77909,7 +77916,10 @@ function planCompositionAssembly(input) {
       ...toArray(assetHead?.querySelectorAll(SCRIPT_SELECTOR)),
       ...toArray(contentNode.querySelectorAll(SCRIPT_SELECTOR))
     ],
-    linkSources: toArray(head?.querySelectorAll(HOISTED_LINK_SELECTOR)),
+    linkSources: [
+      ...toArray(head?.querySelectorAll(HOISTED_LINK_SELECTOR)),
+      ...toArray(contentNode.querySelectorAll(HOISTED_LINK_SELECTOR))
+    ],
     variableDefaultCarriers: [documentElement, innerRoot].filter((carrier) => carrier != null)
   };
 }
@@ -77932,7 +77942,7 @@ function enumerateNestedCompositionHosts(assembledHost, ancestry) {
   }
   return { hosts, skipped };
 }
-var COMPOSITION_ID_ATTR, COMPOSITION_SRC_ATTR, COMPOSITION_ROOT_SELECTOR, COMPOSITION_HOST_SELECTOR, STYLE_SELECTOR, SCRIPT_SELECTOR, HOISTED_LINK_SELECTOR, MAX_SUB_COMPOSITION_DEPTH;
+var COMPOSITION_ID_ATTR, COMPOSITION_SRC_ATTR, COMPOSITION_ROOT_SELECTOR, COMPOSITION_HOST_SELECTOR, STYLE_SELECTOR, SCRIPT_SELECTOR, HOISTED_LINK_SELECTOR, EXTRACTED_COMPOSITION_ASSET_SELECTOR, MAX_SUB_COMPOSITION_DEPTH;
 var init_compositionAssembly = __esm({
   "../core/dist/compiler/compositionAssembly.js"() {
     "use strict";
@@ -77943,6 +77953,7 @@ var init_compositionAssembly = __esm({
     STYLE_SELECTOR = "style";
     SCRIPT_SELECTOR = "script";
     HOISTED_LINK_SELECTOR = 'link[rel="stylesheet"], link[rel="preconnect"]';
+    EXTRACTED_COMPOSITION_ASSET_SELECTOR = `${STYLE_SELECTOR}, ${SCRIPT_SELECTOR}, ${HOISTED_LINK_SELECTOR}`;
     MAX_SUB_COMPOSITION_DEPTH = 20;
   }
 });
@@ -77988,8 +77999,7 @@ function inlineSubCompositions(document2, hosts, options) {
       compId = hostEl.getAttribute("data-composition-id") || null;
       runtimeCompId = compId || "";
     }
-    const contentRoot = compDoc.querySelector("template");
-    const contentHtml = contentRoot ? contentRoot.innerHTML || "" : compDoc.body?.innerHTML || "";
+    const { contentHtml, hasTemplate } = resolveSubCompositionContent(compHtml, compDoc);
     if (!contentHtml.trim()) {
       onMissingComposition?.(src);
       continue;
@@ -78003,7 +78013,7 @@ function inlineSubCompositions(document2, hosts, options) {
       contentNode: contentDoc,
       head: compDoc.head,
       documentElement: compDoc.documentElement,
-      hasTemplate: Boolean(contentRoot),
+      hasTemplate,
       compositionId: compId
     });
     const innerRoot = plan2.innerRoot;
@@ -78086,7 +78096,7 @@ function inlineSubCompositions(document2, hosts, options) {
     }
     if (innerRoot) {
       innerRoot.setAttribute("data-composition-file", src);
-      for (const child of [...innerRoot.querySelectorAll("style, script")])
+      for (const child of [...innerRoot.querySelectorAll(EXTRACTED_COMPOSITION_ASSET_SELECTOR)])
         child.remove();
       if (flattenInnerRoot) {
         const prepared = flattenInnerRoot(innerRoot);
@@ -78101,7 +78111,7 @@ function inlineSubCompositions(document2, hosts, options) {
         }
       }
     } else {
-      for (const child of [...contentDoc.querySelectorAll("style, script")])
+      for (const child of [...contentDoc.querySelectorAll(EXTRACTED_COMPOSITION_ASSET_SELECTOR)])
         child.remove();
       const bodyHtml = contentDoc.body?.innerHTML || "";
       hostEl.innerHTML = bodyHtml || contentDoc.documentElement?.outerHTML || "";
@@ -94769,7 +94779,7 @@ var EmptyCompositionError = class extends Error {
       `${problems.length} composition file${problems.length === 1 ? "" : "s"} referenced by data-composition-src cannot be rendered:
 ${lines.join("\n")}
 
-Check that each file referenced by data-composition-src contains valid HTML with a <template> or <body> containing a [data-composition-id] element. If a scene-authoring step is still running, wait for it to finish before referencing the file.`
+Check that each file referenced by data-composition-src contains valid HTML with a [data-composition-id] element in a <template>, <body>, or bare fragment. If a scene-authoring step is still running, wait for it to finish before referencing the file.`
     );
     this.name = "EmptyCompositionError";
     this.problems = problems;
@@ -103438,8 +103448,8 @@ async function runFontLocalize(io, localize) {
 }
 
 // src/version.ts
-var VERSION = true ? "0.8.65" : "0.0.0-dev";
-var PRODUCER_VERSION = true ? "0.8.65" : "0.0.0-dev";
+var VERSION = true ? "0.8.66" : "0.0.0-dev";
+var PRODUCER_VERSION = true ? "0.8.66" : "0.0.0-dev";
 
 // src/fontLocalizeCli.ts
 async function readStdin() {