@hyperframes/core 0.8.142 → 0.8.144

package/dist/beats/beatFile.d.ts

@@ -13,7 +13,7 @@ export declare function parseBeats(content: string): {
  * the FIRST `<audio>`, or `<video data-has-audio="true">` without `muted` (in
  * document order) where data-timeline-role="music", or —
  * when no role is set — whose id matches the music regex. An explicit non-music
- * role excludes the element. Returns the raw src attribute, or null.
+ * role excludes the element. Returns the decoded src attribute, or null.
  */
 export declare function findMusicAudioSrc(html: string): string | null;
 //# sourceMappingURL=beatFile.d.ts.map

package/dist/beats/beatFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"beatFile.d.ts","sourceRoot":"","sources":["../../src/beats/beatFile.ts"],"names":[],"mappings":"AAUA,oFAAoF;AACpF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CA8BhF;AAED,mFAAmF;AACnF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAGhF;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAO1F;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,IAAI,CAsB3F;AAcD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAiB7D"}
+{"version":3,"file":"beatFile.d.ts","sourceRoot":"","sources":["../../src/beats/beatFile.ts"],"names":[],"mappings":"AAgBA,oFAAoF;AACpF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CA8BhF;AAED,mFAAmF;AACnF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAGhF;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAO1F;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,IAAI,CAsB3F;AAoBD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAc7D"}

package/dist/beats/beatFile.js

@@ -1,6 +1,7 @@
 // Persistence for beat data: one JSON file per audio file, matched by the
 // audio's project-relative path. Lives under `beats/` in the project so it
 // survives the audio being removed and re-added.
+import { decodeAuthoredAttribute, scanHtmlOpeningTags, } from "@hyperframes/parsers";
 /** Project-relative path of the audio file behind a (possibly absolute) src URL. */
 export function audioRelPathForSrc(src) {
     if (!src)
@@ -79,12 +80,15 @@ export function parseBeats(content) {
 }
 const MUSIC_ID_RE = /\b(music|bgm|soundtrack|background[-_]?music)\b/i;
 function attr(tag, name) {
-    const m = tag.match(new RegExp(`\\b${name}\\s*=\\s*["']([^"']*)["']`, "i"));
-    return m ? m[1] : null;
+    const attribute = tag.attributes.find((value) => value.name === name);
+    return attribute?.kind === "value" ? decodeAuthoredAttribute(attribute.value) : null;
 }
 function isSoundingVideoTag(tag) {
-    const unquoted = tag.replace(/"[^"]*"|'[^']*'/g, '""');
-    return attr(tag, "data-has-audio") === "true" && !/\smuted(?=[\s/>=])/i.test(unquoted);
+    return (attr(tag, "data-has-audio") === "true" &&
+        !tag.attributes.some((attribute) => attribute.name === "muted"));
+}
+function isMusicSourceTag(tag) {
+    return tag.closed && (tag.name === "audio" || (tag.name === "video" && isSoundingVideoTag(tag)));
 }
 /**
  * Find the music track's src in composition HTML, applying the SAME rules as the
@@ -92,14 +96,11 @@ function isSoundingVideoTag(tag) {
  * the FIRST `<audio>`, or `<video data-has-audio="true">` without `muted` (in
  * document order) where data-timeline-role="music", or —
  * when no role is set — whose id matches the music regex. An explicit non-music
- * role excludes the element. Returns the raw src attribute, or null.
+ * role excludes the element. Returns the decoded src attribute, or null.
  */
 export function findMusicAudioSrc(html) {
-    // `[^>]*` spans newlines (it's a negated class, not `.`), so multi-line opening
-    // tags are handled. HyperFrames authors src as an attribute on <audio>.
-    const tags = html.match(/<(?:audio|video)\b[^>]*>/gi) ?? [];
-    for (const tag of tags) {
-        if (/^<video/i.test(tag) && !isSoundingVideoTag(tag))
+    for (const tag of scanHtmlOpeningTags(html)) {
+        if (!isMusicSourceTag(tag))
             continue;
         const src = attr(tag, "src");
         if (!src)

package/dist/beats/beatFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"beatFile.js","sourceRoot":"","sources":["../../src/beats/beatFile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"beatFile.js","sourceRoot":"","sources":["../../src/beats/beatFile.ts"],"names":[],"mappings":"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"}

package/dist/compiler/compositionAssembly.d.ts

@@ -20,7 +20,10 @@
  * takes strings — so both a linkedom document and a live browser document
  * satisfy it without an `as T` cast at either call site.
  */
-export declare const EXTRACTED_COMPOSITION_ASSET_SELECTOR = "style, script, link[rel=\"stylesheet\"], link[rel=\"preconnect\"]";
+export declare function isJavaScriptType(el: AssemblyAttributed): boolean;
+export declare function executableScripts<TElement extends AssemblyAttributed>(node: AssemblyQueryable<TElement> | null | undefined): TElement[];
+/** The styles, scripts and links both paths extract, so the mounted copy must drop them. */
+export declare function extractedCompositionAssets<TElement extends AssemblyAttributed>(node: AssemblyQueryable<TElement>): TElement[];
 /**
  * The compiler's nesting cap, enforced against the ancestry chain rather than a
  * counter so a wide tree is not penalised for a deep sibling.
@@ -102,6 +105,8 @@ export interface CompositionAssemblyPlan<TElement extends AssemblyAttributed> {
     scriptSources: TElement[];
     /** Head and content links to hoist into the host document. */
     linkSources: TElement[];
+    /** Inert scripts the mounted root would leave behind; both paths mount them next to it. */
+    inertScriptsOutsideRoot: TElement[];
     /**
      * Nodes that may declare the composition's variable defaults, in precedence
      * order — later wins. Full-document compositions declare on `<html>`;
@@ -116,7 +121,7 @@ export interface CompositionAssemblyPlan<TElement extends AssemblyAttributed> {
  * how it is identified. Pure: it reads attributes and runs selectors, and does
  * not mutate, fetch, or touch a filesystem.
  */
-export declare function planCompositionAssembly<TElement extends AssemblyAttributed>(input: CompositionAssemblyInput<TElement>): CompositionAssemblyPlan<TElement>;
+export declare function planCompositionAssembly<TElement extends AssemblyAttributed & AssemblyQueryable<TElement>>(input: CompositionAssemblyInput<TElement>): CompositionAssemblyPlan<TElement>;
 export type NestedHostSkipReason = "circular composition reference" | "nesting depth exceeded";
 export interface NestedCompositionHost<TElement> {
     host: TElement;

package/dist/compiler/compositionAssembly.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compositionAssembly.d.ts","sourceRoot":"","sources":["../../src/compiler/compositionAssembly.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAeH,eAAO,MAAM,oCAAoC,sEAAoE,CAAC;AAEtH;;;GAGG;AACH,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAM5C,8DAA8D;AAC9D,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CAC3C;AAED,iEAAiE;AACjE,MAAM,WAAW,iBAAiB,CAAC,QAAQ;IACzC,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,wBAAwB,CAAC,QAAQ,SAAS,kBAAkB;IAC3E;;;;;;;;OAQG;IACH,WAAW,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAEzC;;;;OAIG;IACH,IAAI,CAAC,EAAE,iBAAiB,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;IAE1C;;;OAGG;IACH,eAAe,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IAElC;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,uBAAuB,CAAC,QAAQ,SAAS,kBAAkB;IAC1E;;;;;;OAMG;IACH,SAAS,EAAE,QAAQ,GAAG,IAAI,CAAC;IAE3B;;;OAGG;IACH,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IAErC;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnC,mEAAmE;IACnE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAE9B,8EAA8E;IAC9E,YAAY,EAAE,QAAQ,EAAE,CAAC;IAEzB;;;;OAIG;IACH,aAAa,EAAE,QAAQ,EAAE,CAAC;IAE1B,8DAA8D;IAC9D,WAAW,EAAE,QAAQ,EAAE,CAAC;IAExB;;;;;;OAMG;IACH,uBAAuB,EAAE,QAAQ,EAAE,CAAC;CACrC;AAUD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,SAAS,kBAAkB,EACzE,KAAK,EAAE,wBAAwB,CAAC,QAAQ,CAAC,GACxC,uBAAuB,CAAC,QAAQ,CAAC,CAsCnC;AAMD,MAAM,MAAM,oBAAoB,GAAG,gCAAgC,GAAG,wBAAwB,CAAC;AAE/F,MAAM,WAAW,qBAAqB,CAAC,QAAQ;IAC7C,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,sBAAsB,CAAC,QAAQ;IAC9C,KAAK,EAAE,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;IACzC,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,oBAAoB,CAAA;KAAE,EAAE,CAAC;CAC1D;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAAC,QAAQ,SAAS,kBAAkB,EACjF,aAAa,EAAE,iBAAiB,CAAC,QAAQ,CAAC,EAC1C,QAAQ,EAAE,SAAS,MAAM,EAAE,GAC1B,sBAAsB,CAAC,QAAQ,CAAC,CAmBlC"}
+{"version":3,"file":"compositionAssembly.d.ts","sourceRoot":"","sources":["../../src/compiler/compositionAssembly.ts"],"names":[],"mappings":"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"}

package/dist/compiler/compositionAssembly.js

@@ -31,7 +31,53 @@ const SCRIPT_SELECTOR = "script";
  * webfonts a composition's CSS depends on; preconnects are their latency hint.
  */
 const HOISTED_LINK_SELECTOR = 'link[rel="stylesheet"], link[rel="preconnect"]';
-export const EXTRACTED_COMPOSITION_ASSET_SELECTOR = `${STYLE_SELECTOR}, ${SCRIPT_SELECTOR}, ${HOISTED_LINK_SELECTOR}`;
+// The HTML spec's JavaScript MIME type essence matches: a script with any of these types runs as classic.
+const JAVASCRIPT_TYPES = new Set([
+    "",
+    "application/ecmascript",
+    "application/javascript",
+    "application/x-ecmascript",
+    "application/x-javascript",
+    "text/ecmascript",
+    "text/javascript",
+    "text/javascript1.0",
+    "text/javascript1.1",
+    "text/javascript1.2",
+    "text/javascript1.3",
+    "text/javascript1.4",
+    "text/javascript1.5",
+    "text/jscript",
+    "text/livescript",
+    "text/x-ecmascript",
+    "text/x-javascript",
+]);
+const scriptType = (el) => (el.getAttribute("type") || "").trim().toLowerCase();
+export function isJavaScriptType(el) {
+    return JAVASCRIPT_TYPES.has(scriptType(el));
+}
+/**
+ * A data block (application/json, text/template, ...) or a classic nomodule script never runs,
+ * so it is mounted as authored.
+ */
+function isExecutableScript(el) {
+    const type = scriptType(el);
+    if (type === "module" || type === "importmap")
+        return true;
+    return JAVASCRIPT_TYPES.has(type) && el.getAttribute("nomodule") === null;
+}
+function inertScripts(node) {
+    return toArray(node?.querySelectorAll(SCRIPT_SELECTOR)).filter((el) => !isExecutableScript(el));
+}
+export function executableScripts(node) {
+    return toArray(node?.querySelectorAll(SCRIPT_SELECTOR)).filter(isExecutableScript);
+}
+/** The styles, scripts and links both paths extract, so the mounted copy must drop them. */
+export function extractedCompositionAssets(node) {
+    return [
+        ...toArray(node.querySelectorAll(`${STYLE_SELECTOR}, ${HOISTED_LINK_SELECTOR}`)),
+        ...executableScripts(node),
+    ];
+}
 /**
  * The compiler's nesting cap, enforced against the ancestry chain rather than a
  * counter so a wide tree is not penalised for a deep sibling.
@@ -60,6 +106,7 @@ export function planCompositionAssembly(input) {
     const declaredCompositionId = (innerRoot ?? compositionRoots[0])?.getAttribute(COMPOSITION_ID_ATTR)?.trim() || "";
     // A templated composition's <head> belongs to its host page, not to it.
     const assetHead = hasTemplate ? null : (head ?? null);
+    const mountedInert = innerRoot ? inertScripts(innerRoot) : [];
     return {
         innerRoot,
         authoredCompositionId: compositionId || declaredCompositionId || null,
@@ -69,14 +116,15 @@ export function planCompositionAssembly(input) {
             ...toArray(assetHead?.querySelectorAll(STYLE_SELECTOR)),
             ...toArray(contentNode.querySelectorAll(STYLE_SELECTOR)),
         ],
-        scriptSources: [
-            ...toArray(assetHead?.querySelectorAll(SCRIPT_SELECTOR)),
-            ...toArray(contentNode.querySelectorAll(SCRIPT_SELECTOR)),
-        ],
+        scriptSources: [...executableScripts(assetHead), ...executableScripts(contentNode)],
         linkSources: [
             ...toArray(head?.querySelectorAll(HOISTED_LINK_SELECTOR)),
             ...toArray(contentNode.querySelectorAll(HOISTED_LINK_SELECTOR)),
         ],
+        inertScriptsOutsideRoot: [
+            ...inertScripts(assetHead),
+            ...(innerRoot ? inertScripts(contentNode).filter((el) => !mountedInert.includes(el)) : []),
+        ],
         variableDefaultCarriers: [documentElement, innerRoot].filter((carrier) => carrier != null),
     };
 }

package/dist/compiler/compositionAssembly.js.map

@@ -1 +1 @@
-{"version":3,"file":"compositionAssembly.js","sourceRoot":"","sources":["../../src/compiler/compositionAssembly.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compositionAssembly.js","sourceRoot":"","sources":["../../src/compiler/compositionAssembly.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,MAAM,mBAAmB,GAAG,qBAAqB,CAAC;AAClD,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AACpD,MAAM,yBAAyB,GAAG,IAAI,mBAAmB,GAAG,CAAC;AAC7D,MAAM,yBAAyB,GAAG,IAAI,oBAAoB,GAAG,CAAC;AAC9D,MAAM,cAAc,GAAG,OAAO,CAAC;AAC/B,MAAM,eAAe,GAAG,QAAQ,CAAC;AAEjC;;;GAGG;AACH,MAAM,qBAAqB,GAAG,gDAAgD,CAAC;AAE/E,0GAA0G;AAC1G,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;IAC/B,EAAE;IACF,wBAAwB;IACxB,wBAAwB;IACxB,0BAA0B;IAC1B,0BAA0B;IAC1B,iBAAiB;IACjB,iBAAiB;IACjB,oBAAoB;IACpB,oBAAoB;IACpB,oBAAoB;IACpB,oBAAoB;IACpB,oBAAoB;IACpB,oBAAoB;IACpB,cAAc;IACd,iBAAiB;IACjB,mBAAmB;IACnB,mBAAmB;CACpB,CAAC,CAAC;AAEH,MAAM,UAAU,GAAG,CAAC,EAAsB,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAEpG,MAAM,UAAU,gBAAgB,CAAC,EAAsB;IACrD,OAAO,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,CAAC;AAED;;;GAGG;AACH,SAAS,kBAAkB,CAAC,EAAsB;IAChD,MAAM,IAAI,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;IAC5B,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,WAAW;QAAE,OAAO,IAAI,CAAC;IAC3D,OAAO,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;AAC5E,CAAC;AAED,SAAS,YAAY,CACnB,IAAoD;IAEpD,OAAO,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;AAClG,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,IAAoD;IAEpD,OAAO,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;AACrF,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,0BAA0B,CACxC,IAAiC;IAEjC,OAAO;QACL,GAAG,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,cAAc,KAAK,qBAAqB,EAAE,CAAC,CAAC;QAChF,GAAG,iBAAiB,CAAC,IAAI,CAAC;KAC3B,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,CAAC;AA6G5C,8EAA8E;AAC9E,YAAY;AACZ,8EAA8E;AAE9E,SAAS,OAAO,CAAW,KAA4C;IACrE,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAErC,KAAyC;IACzC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAEjF,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,CAAC,CAAC;IAC1F,MAAM,SAAS,GAAG,aAAa;QAC7B,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,KAAK,aAAa,CAAC;YAC1F,IAAI,CAAC;QACP,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;IAElC,qEAAqE;IACrE,yEAAyE;IACzE,MAAM,qBAAqB,GACzB,CAAC,SAAS,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAEtF,wEAAwE;IACxE,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9D,OAAO;QACL,SAAS;QACT,qBAAqB,EAAE,aAAa,IAAI,qBAAqB,IAAI,IAAI;QACrE,mBAAmB,EAAE,qBAAqB,IAAI,aAAa,IAAI,IAAI;QACnE,cAAc,EAAE,SAAS,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI;QAC7D,YAAY,EAAE;YACZ,GAAG,OAAO,CAAC,SAAS,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC;YACvD,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;SACzD;QACD,aAAa,EAAE,CAAC,GAAG,iBAAiB,CAAC,SAAS,CAAC,EAAE,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACnF,WAAW,EAAE;YACX,GAAG,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;YACzD,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;SAChE;QACD,uBAAuB,EAAE;YACvB,GAAG,YAAY,CAAC,SAAS,CAAC;YAC1B,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3F;QACD,uBAAuB,EAAE,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,MAAM,CAC1D,CAAC,OAAO,EAAuB,EAAE,CAAC,OAAO,IAAI,IAAI,CAClD;KACF,CAAC;AACJ,CAAC;AAkBD;;;;;;GAMG;AACH,MAAM,UAAU,+BAA+B,CAC7C,aAA0C,EAC1C,QAA2B;IAE3B,MAAM,KAAK,GAAsC,EAAE,CAAC;IACpD,MAAM,OAAO,GAAoD,EAAE,CAAC;IAEpE,KAAK,MAAM,UAAU,IAAI,aAAa,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,EAAE,CAAC;QACnF,MAAM,GAAG,GAAG,UAAU,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;QAC1D,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,gCAAgC,EAAE,CAAC,CAAC;YAChE,SAAS;QACX,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,IAAI,yBAAyB,EAAE,CAAC;YACjD,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAC;YACxD,SAAS;QACX,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC5B,CAAC"}

package/dist/compiler/htmlBundler.d.ts

@@ -6,6 +6,7 @@ export type BundledHostCompositionIdentity = {
 };
 export declare function assignBundledRuntimeCompositionIds(hosts: Element[], counts?: Map<string, number>): Map<Element, BundledHostCompositionIdentity>;
 export declare function prepareFlattenedInnerRoot(innerRoot: Element): Element;
+export declare function parsesAsScript(source: string): boolean;
 export interface BundleOptions {
     /** Project-relative HTML entry to bundle. Defaults to `index.html`. */
     entryFile?: string;

package/dist/compiler/htmlBundler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"htmlBundler.d.ts","sourceRoot":"","sources":["../../src/compiler/htmlBundler.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,gCAAgC,EAAE,MAAM,0BAA0B,CAAC;AAS5E,OAAO,EAAe,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAodvE,MAAM,MAAM,8BAA8B,GAAG;IAC3C,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC,CAAC;AA4CF,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,OAAO,EAAE,EAChB,MAAM,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAA6C,GACtE,GAAG,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAyC9C;AAED,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAWrE;AA0MD,MAAM,WAAW,aAAa;IAC5B,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,oGAAoG;IACpG,kBAAkB,CAAC,EAAE,mBAAmB,CAAC;IACzC;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC;IACnC;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,uGAAuG;IACvG,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,kFAAkF;IAClF,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AA8GD,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAG/F;AAmaD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,QAAQ,EAClB,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM,EAC7D,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACtC,OAAO,CAcT"}
+{"version":3,"file":"htmlBundler.d.ts","sourceRoot":"","sources":["../../src/compiler/htmlBundler.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,gCAAgC,EAAE,MAAM,0BAA0B,CAAC;AAiB5E,OAAO,EAAe,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAqdvE,MAAM,MAAM,8BAA8B,GAAG;IAC3C,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC,CAAC;AA4CF,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,OAAO,EAAE,EAChB,MAAM,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAA6C,GACtE,GAAG,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAyC9C;AAED,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAWrE;AAsMD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAOtD;AAgBD,MAAM,WAAW,aAAa;IAC5B,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,oGAAoG;IACpG,kBAAkB,CAAC,EAAE,mBAAmB,CAAC;IACzC;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC;IACnC;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,uGAAuG;IACvG,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,kFAAkF;IAClF,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AA6HD,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAG/F;AAkbD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,QAAQ,EAClB,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM,EAC7D,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACtC,OAAO,CAcT"}

package/dist/compiler/htmlBundler.js

@@ -1,7 +1,8 @@
-import { compositionStyle, cssStyleMergeKey, deferScriptsUntilFonts, UNCONDITIONAL_CSS_KEY, headStyleRuns, INLINED_FILE_ATTR, inlineScriptRuns, isJavaScriptType, styleElementsFor, } from "./scriptRuns.js";
+import { compositionStyle, cssStyleMergeKey, deferScriptsUntilFonts, UNCONDITIONAL_CSS_KEY, headStyleRuns, INLINED_FILE_ATTR, inlineScriptRuns, styleElementsFor, } from "./scriptRuns.js";
+import { executableScripts, isJavaScriptType, planCompositionAssembly, } from "./compositionAssembly.js";
 import { SCENE_PART_ATTR } from "../sceneParts.js";
 import { ensureExternalScriptTag, readExternalScriptAttributes, } from "./externalScripts.js";
-import { emitMountedModuleScripts } from "./importMaps.js";
+import { emitMountedModuleScripts, parseImportMap } from "./importMaps.js";
 import { markFlattenedInnerRoot } from "../runtime/flattenedRoot.js";
 export { FLATTENED_INNER_ROOT_STRIP_ATTRS } from "../runtime/flattenedRoot.js";
 import { parseHostVariableValues, warnUnknownEnumValues } from "../runtime/getVariables.js";
@@ -9,18 +10,19 @@ import { sanitizeCssValue } from "../runtime/applyVariableBindings.js";
 import { cssVariableName } from "../tokenSlug.js";
 import { AsyncLocalStorage } from "async_hooks";
 import { readFileSync, existsSync, statSync } from "fs";
+import { parse as parseJs } from "acorn";
 import { resolve, relative, dirname, isAbsolute, sep } from "path";
+import { decodeCssEscapes, decodeWellFormedEscapes, encodeUrlPath, decodedUrlPath, splitUrlSuffix, } from "@hyperframes/parsers/asset-paths";
 import { CSS_URL_RE, isNonRelativeUrl } from "./assetPaths.js";
 import { transformSync } from "esbuild";
 import { compileHtml } from "./htmlCompiler.js";
 import { RUNTIME_BOOTSTRAP_ATTR, escapeInlineScriptSource, insertRuntimeTag, parseHTMLContent, stripEmbeddedRuntimeScripts, } from "./htmlDocument.js";
 // rewriteSubCompPaths functions are used by inlineSubCompositions (shared module)
-import { buildVariablesByCompScript, dedupeFontFaceRules, scopeCssToComposition, wrapInlineScriptWithErrorBoundary, wrapScopedCompositionScript, } from "./compositionScoping.js";
+import { buildVariablesByCompScript, dedupeFontFaceRules, scopeCssToComposition, wrapInlineScriptWithErrorBoundary, scopedModulePrelude, wrapScopedCompositionScript, } from "./compositionScoping.js";
 import { validateHyperframeHtmlContract } from "./staticGuard.js";
 import { getHyperframeRuntimeScript } from "../generated/runtime-inline.js";
 import { readDeclaredDefaults } from "../runtime/getVariables.js";
 import { ensureExternalLinkTag, inlineSubCompositions, refuseSwapsReachedByRootScripts, } from "./inlineSubCompositions.js";
-import { queryByAttr } from "../utils/cssSelector.js";
 import { isSafePath, resolveWithinProject } from "../safePath.js";
 import { ensureHfIds } from "@hyperframes/parsers/hf-ids";
 import { HF_COLOR_GRADING_ATTR } from "../colorGrading.js";
@@ -90,30 +92,35 @@ function withCommentsStripped(css, fn) {
     };
     return { result, restore };
 }
+function resolveRelativeUrlPath(fromDir, basePath) {
+    return resolve(fromDir, decodeWellFormedEscapes(basePath.replaceAll("\\", "/")));
+}
 function rebaseCssUrls(css, cssFileDir, projectDir) {
     const resolvedRoot = resolve(projectDir);
     const resolvedDir = resolve(cssFileDir);
     if (resolvedDir === resolvedRoot)
         return css;
     return css.replace(CSS_URL_RE, (full, quote, urlValue) => {
-        if (!urlValue || !isRelativeUrl(urlValue))
+        const decoded = decodeCssEscapes(urlValue);
+        if (!decoded || !isRelativeUrl(decoded))
             return full;
-        const { basePath, suffix } = splitUrlSuffix(urlValue.trim());
+        const { basePath, suffix } = splitUrlSuffix(decoded);
         if (!basePath)
             return full;
-        const absolutePath = resolve(resolvedDir, basePath);
-        const rebased = relative(resolvedRoot, absolutePath).split(sep).join("/");
+        const absolutePath = resolveRelativeUrlPath(resolvedDir, basePath);
+        const rebased = encodeUrlPath(relative(resolvedRoot, absolutePath).split(sep).join("/"));
         if (rebased === basePath)
             return full;
-        return `url(${quote || ""}${rebased}${suffix}${quote || ""})`;
+        const escapedSuffix = suffix.replace(/[\s\p{Cc}"'()\\<>]/gu, (char) => `\\${char.codePointAt(0).toString(16).padStart(6, "0")}`);
+        return `url(${quote || ""}${rebased}${escapedSuffix}${quote || ""})`;
     });
 }
 function rebaseRelativePath(urlValue, fromDir, toDir) {
     const { basePath, suffix } = splitUrlSuffix(urlValue.trim());
     if (!basePath)
         return urlValue;
-    const absolutePath = resolve(fromDir, basePath);
-    const rebased = relative(resolve(toDir), absolutePath).split(sep).join("/");
+    const absolutePath = resolveRelativeUrlPath(fromDir, basePath);
+    const rebased = encodeUrlPath(relative(resolve(toDir), absolutePath).split(sep).join("/"));
     return appendSuffixToUrl(rebased, suffix);
 }
 function rebaseSrcsetPaths(srcsetValue, fromDir, toDir) {
@@ -200,7 +207,7 @@ function inlineCssFile(css, cssFileDir, projectDir, visited = new Set()) {
         const importPath = urlPath ?? barePath;
         if (!importPath || !isRelativeUrl(importPath))
             return full;
-        const resolved = resolve(cssFileDir, importPath);
+        const resolved = resolve(cssFileDir, decodedUrlPath(importPath));
         // @import is resolved relative to the CSS file, but must stay within the
         // project root; isSafePath also blocks symlink escapes (content is inlined).
         if (!isSafePath(projectDir, resolved))
@@ -236,14 +243,6 @@ function safeReadFileBuffer(filePath) {
         return null;
     }
 }
-function splitUrlSuffix(urlValue) {
-    const queryIdx = urlValue.indexOf("?");
-    const hashIdx = urlValue.indexOf("#");
-    if (queryIdx < 0 && hashIdx < 0)
-        return { basePath: urlValue, suffix: "" };
-    const cutIdx = queryIdx < 0 ? hashIdx : hashIdx < 0 ? queryIdx : Math.min(queryIdx, hashIdx);
-    return { basePath: urlValue.slice(0, cutIdx), suffix: urlValue.slice(cutIdx) };
-}
 function appendSuffixToUrl(baseUrl, suffix) {
     if (!suffix)
         return baseUrl;
@@ -320,7 +319,7 @@ function maybeInlineRelativeAssetUrl(urlValue, projectDir, inlineAssets) {
     const { basePath, suffix } = splitUrlSuffix(urlValue.trim());
     if (!basePath)
         return null;
-    const filePath = resolveWithinProject(projectDir, basePath);
+    const filePath = resolveWithinProject(projectDir, decodeWellFormedEscapes(basePath));
     if (!filePath)
         return null;
     const ext = filePath.toLowerCase().match(/\.[^.]+$/)?.[0] ?? "";
@@ -666,12 +665,17 @@ function coalesceHeadStylesAndBodyScripts(document) {
     const isPinned = (el) => el.hasAttribute(RUNTIME_BOOTSTRAP_ATTR) || el.hasAttribute(SCENE_PART_ATTR);
     for (const { members, anchor } of inlineScriptRuns([...document.querySelectorAll("body script")], isPinned)) {
         const mergedJs = joinJsChunks(members.map((el) => el.textContent || ""));
+        if (mergedJs && !parsesAsScript(mergedJs)) {
+            for (const el of members)
+                el.textContent = inlineScriptSource(el.textContent || "");
+            continue;
+        }
         for (const el of members)
             el.remove();
         if (!mergedJs)
             continue;
         const inlineScript = document.createElement("script");
-        inlineScript.textContent = escapeInlineScriptSource(stripJsCommentsParserSafe(mergedJs));
+        inlineScript.textContent = inlineScriptSource(mergedJs);
         if (anchor)
             anchor.before(inlineScript);
         else
@@ -723,6 +727,17 @@ function joinJsChunks(chunks) {
         .map((chunk) => (chunk.endsWith(";") ? chunk : chunk + "\n;"))
         .join("\n");
 }
+// acorn in script mode, not the host engine: Bun 1.3's vm.Script compiles lazily and accepts anything.
+// esbuild accepts export, top-level await and return, which a <script> rejects; acorn does not.
+export function parsesAsScript(source) {
+    try {
+        parseJs(source, { ecmaVersion: "latest", sourceType: "script" });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 function stripJsCommentsParserSafe(source) {
     if (!source)
         return source;
@@ -734,6 +749,9 @@ function stripJsCommentsParserSafe(source) {
         return source;
     }
 }
+function inlineScriptSource(js) {
+    return escapeInlineScriptSource(stripJsCommentsParserSafe(js));
+}
 function preserveLocalScriptIntegrity(doc, src, resolvePath) {
     const path = resolvePath(src);
     if (!path)
@@ -758,10 +776,10 @@ function hoistExternalScript(src, projectDir, doc, seenSrcs, chunks, attributes)
         return;
     seenSrcs.add(src);
     if (!isNonRelativeUrl(src) && !isAbsolute(src) && attributes.type !== "module") {
-        const jsPath = resolveWithinProject(projectDir, src);
+        const jsPath = resolveWithinProject(projectDir, decodedUrlPath(src));
         const js = jsPath ? safeReadFile(jsPath) : null;
         if (js != null) {
-            chunks.push(() => preserveLocalScriptIntegrity(doc, src, (value) => resolveWithinProject(projectDir, value))
+            chunks.push(() => preserveLocalScriptIntegrity(doc, src, (value) => resolveWithinProject(projectDir, decodedUrlPath(value)))
                 ? ""
                 : js);
             return;
@@ -770,9 +788,21 @@ function hoistExternalScript(src, projectDir, doc, seenSrcs, chunks, attributes)
     ensureExternalScriptTag(doc, src, attributes);
 }
 function hoistCompositionScripts(container, opts) {
-    for (const scriptEl of [...container.querySelectorAll("script")]) {
+    for (const scriptEl of executableScripts(container)) {
         const externalSrc = (scriptEl.getAttribute("src") || "").trim();
-        if (externalSrc) {
+        const type = (scriptEl.getAttribute("type") || "").trim().toLowerCase();
+        if (!externalSrc && type === "importmap") {
+            const map = parseImportMap(scriptEl.textContent || "", (url) => url);
+            if (map)
+                opts.importMaps.push(map);
+            else
+                console.warn(`[HyperFrames] ${opts.compId}: import map is not valid JSON, so it is skipped.`);
+        }
+        else if (!externalSrc && type === "module") {
+            const prelude = opts.compId ? scopedModulePrelude(opts.runtimeCompId || opts.compId) : "";
+            opts.moduleScripts.push(prelude + (scriptEl.textContent || ""));
+        }
+        else if (externalSrc) {
             hoistExternalScript(externalSrc, opts.projectDir, opts.document, opts.seenCompScriptSrcs, opts.compScriptChunks, readExternalScriptAttributes(scriptEl));
         }
         else {
@@ -798,6 +828,7 @@ async function bundleProject(projectDir, options) {
         const resolved = resolve(sourceDir, relativePath);
         return isSafePath(projectDir, resolved) ? resolved : null;
     };
+    const resolveEntryUrl = (url) => resolveEntryPath(decodedUrlPath(url));
     const readSource = options?.stampHfIds ? ensureHfIds : (html) => html;
     noteRead(indexPath);
     const rawHtml = readSource(readFileSync(indexPath, "utf-8"));
@@ -819,7 +850,7 @@ async function bundleProject(projectDir, options) {
             continue;
         if (el.hasAttribute("disabled"))
             continue;
-        const cssPath = resolveEntryPath(href);
+        const cssPath = resolveEntryUrl(href);
         if (!cssPath)
             continue;
         const css = safeReadFile(cssPath);
@@ -843,7 +874,7 @@ async function bundleProject(projectDir, options) {
             ]),
         ].map((el) => {
             const src = el.getAttribute("src");
-            const path = src && isRelativeUrl(src) ? resolveEntryPath(src) : null;
+            const path = src && isRelativeUrl(src) ? resolveEntryUrl(src) : null;
             return src ? (path && safeReadFile(path)) || "" : el.textContent || "";
         })
         : [];
@@ -907,10 +938,10 @@ async function bundleProject(projectDir, options) {
             continue;
         seenCompScriptSrcs.add(extSrc);
         if (isRelativeUrl(extSrc) && scriptItem.type !== "module") {
-            const jsPath = resolveEntryPath(extSrc);
+            const jsPath = resolveEntryUrl(extSrc);
             const js = jsPath ? safeReadFile(jsPath) : null;
             if (js != null) {
-                const chunk = () => preserveLocalScriptIntegrity(document, extSrc, resolveEntryPath) ? "" : js;
+                const chunk = () => preserveLocalScriptIntegrity(document, extSrc, resolveEntryUrl) ? "" : js;
                 pushRun(scriptRuns, scriptItem.scene, chunk);
                 continue;
             }
@@ -937,8 +968,12 @@ async function bundleProject(projectDir, options) {
             const hostIdentity = hostIdentityByElement.get(host);
             const runtimeCompId = hostIdentity?.runtimeCompositionId || compId;
             const innerDoc = parseHTMLContent(templateHtml);
-            const innerRoot = queryByAttr(innerDoc, "data-composition-id", compId);
-            const authoredRootId = innerRoot?.getAttribute("id")?.trim() || null;
+            const plan = planCompositionAssembly({
+                contentNode: innerDoc,
+                hasTemplate: true,
+                compositionId: compId,
+            });
+            const { innerRoot, authoredRootId } = plan;
             const runtimeScope = runtimeCompId
                 ? cssAttributeSelector("data-composition-id", runtimeCompId)
                 : "";
@@ -976,6 +1011,8 @@ async function bundleProject(projectDir, options) {
                     authoredRootId: authoredRootId ?? undefined,
                     seenCompScriptSrcs,
                     compScriptChunks,
+                    importMaps: subCompResult.importMaps,
+                    moduleScripts: subCompResult.moduleScripts,
                 });
                 // Copy dimension attributes from inner root to host if not already set
                 const innerW = innerRoot.getAttribute("data-width");
@@ -1009,9 +1046,13 @@ async function bundleProject(projectDir, options) {
                     authoredRootId: undefined,
                     seenCompScriptSrcs,
                     compScriptChunks,
+                    importMaps: subCompResult.importMaps,
+                    moduleScripts: subCompResult.moduleScripts,
                 });
                 host.innerHTML = innerDoc.body.innerHTML || "";
             }
+            for (const el of plan.inertScriptsOutsideRoot)
+                host.insertAdjacentHTML("beforeend", el.outerHTML);
         }
         // Remove the template element from the document
         templateEl.remove();
@@ -1020,14 +1061,14 @@ async function bundleProject(projectDir, options) {
         const src = el.getAttribute("src");
         if (!src || !isRelativeUrl(src))
             continue;
-        if (preserveLocalScriptIntegrity(document, src, resolveEntryPath))
+        if (preserveLocalScriptIntegrity(document, src, resolveEntryUrl))
             continue;
         // Module scripts can contain static imports whose resolution is relative
         // to the script URL. Folding their source into a classic inline script
         // both drops module semantics and changes the import base URL.
         if ((el.getAttribute("type") || "").trim().toLowerCase() === "module")
             continue;
-        const jsPath = resolveEntryPath(src);
+        const jsPath = resolveEntryUrl(src);
         const js = jsPath ? safeReadFile(jsPath) : null;
         if (js == null)
             continue;
@@ -1057,11 +1098,16 @@ async function bundleProject(projectDir, options) {
         }
     }
     for (const { scene, chunks } of scriptRuns) {
-        const script = document.createElement("script");
-        if (scene)
-            script.setAttribute(SCENE_PART_ATTR, scene);
-        script.textContent = joinJsChunks(chunks.map((chunk) => (typeof chunk === "string" ? chunk : chunk())));
-        document.body.appendChild(script);
+        const texts = chunks.map((chunk) => (typeof chunk === "string" ? chunk : chunk()));
+        const joined = joinJsChunks(texts);
+        const skipsRunMerge = Boolean(scene);
+        for (const text of parsesAsScript(joined) ? [joined] : texts.filter(Boolean)) {
+            const script = document.createElement("script");
+            if (scene)
+                script.setAttribute(SCENE_PART_ATTR, scene);
+            script.textContent = skipsRunMerge ? inlineScriptSource(text) : text;
+            document.body.appendChild(script);
+        }
     }
     emitMountedModuleScripts(document, subCompResult.importMaps, subCompResult.moduleScripts);
     emitRootCompositionVariableStyles(document, compVariablesByComp);