@hyperframes/core 0.8.166 → 0.8.168

package/dist/audioGroups.js

@@ -97,11 +97,8 @@ export function isMemberGroupHidden(doc, el) {
  * a sub-composition's root is skipped, so repeating one cannot stack chains.
  */
 export function resolveMasterBusElement(root) {
-    for (const el of root.querySelectorAll("[data-composition-id]")) {
-        if (!el.parentElement?.closest("[data-composition-id]"))
-            return el;
-    }
-    return null;
+    const first = root.querySelector("[data-composition-id]");
+    return first && !first.parentElement?.closest("[data-composition-id]") ? first : null;
 }
 /** The master bus chain: the top-level root's `data-fx-chain`, if it carries one. */
 export function readMasterFxChain(root) {

package/dist/compiler/compositionAssembly.d.ts

@@ -142,3 +142,5 @@ export interface NestedCompositionHosts<TElement> {
  * `src`, so a top-level host is enumerated with `[itsOwnSrc]`.
  */
 export declare function enumerateNestedCompositionHosts<TElement extends AssemblyAttributed>(assembledHost: AssemblyQueryable<TElement>, ancestry: readonly string[]): NestedCompositionHosts<TElement>;
+/** A mount sharing the page root's id counts as a repeat, so it is numbered instead of taking the root's timeline. */
+export declare function countPageRoot(counts: Map<string, number>, hosts: readonly Element[]): void;

package/dist/compiler/compositionAssembly.js

@@ -154,3 +154,11 @@ export function enumerateNestedCompositionHosts(assembledHost, ancestry) {
     }
     return { hosts, skipped };
 }
+/** A mount sharing the page root's id counts as a repeat, so it is numbered instead of taking the root's timeline. */
+export function countPageRoot(counts, hosts) {
+    const root = hosts[0]?.ownerDocument.querySelector("[data-composition-id]");
+    const rootId = root && !hosts.includes(root) ? root.getAttribute("data-composition-id") : null;
+    const mounts = rootId ? counts.get(rootId) : undefined;
+    if (rootId && mounts)
+        counts.set(rootId, mounts + 1);
+}

package/dist/compiler/compositionScoping.js

@@ -343,10 +343,8 @@ export function wrapScopedCompositionScript(source, compositionId, errorLabel =
           if (prop !== __hfCompId) {
             return Reflect.get(target, prop, target);
           }
-          var authoredValue = Reflect.get(target, prop, target);
-          return authoredValue === undefined
-            ? Reflect.get(target, __hfTimelineCompId, target)
-            : authoredValue;
+          var runtimeValue = Reflect.get(target, __hfTimelineCompId, target);
+          return runtimeValue === undefined ? Reflect.get(target, prop, target) : runtimeValue;
         },
         set: function(target, prop, value, receiver) {
           if (prop !== __hfCompId) {
@@ -354,11 +352,15 @@ export function wrapScopedCompositionScript(source, compositionId, errorLabel =
           }
           // The authored node remains in the compiled DOM when its local id
           // differs from the runtime mount id, so readiness legitimately sees
-          // both compositions. Publish the same timeline under both identities
-          // instead of replacing one with the other.
-          var authoredSet = Reflect.set(target, __hfCompId, value, target);
+          // both compositions. Publish the same timeline under both identities,
+          // unless another mount of the same file already owns the authored one.
+          var authoredValue = Reflect.get(target, __hfCompId, target);
+          var ownsAuthored =
+            authoredValue === undefined ||
+            authoredValue === Reflect.get(target, __hfTimelineCompId, target);
           var runtimeSet = Reflect.set(target, __hfTimelineCompId, value, target);
-          return authoredSet && runtimeSet;
+          if (!ownsAuthored) return runtimeSet;
+          return Reflect.set(target, __hfCompId, value, target) && runtimeSet;
         },
       });
     }

package/dist/compiler/htmlBundler.js

@@ -1,6 +1,6 @@
 import { createHash } from "node:crypto";
 import { compositionStyle, cssStyleMergeKey, deferScriptsUntilFonts, UNCONDITIONAL_CSS_KEY, headStyleRuns, INLINED_FILE_ATTR, inlineScriptRuns, styleElementsFor, } from "./scriptRuns.js";
-import { executableScripts, isJavaScriptType, planCompositionAssembly, } from "./compositionAssembly.js";
+import { countPageRoot, executableScripts, isJavaScriptType, planCompositionAssembly, } from "./compositionAssembly.js";
 import { SCENE_PART_ATTR } from "../sceneParts.js";
 import { ensureExternalScriptTag, readExternalScriptAttributes, } from "./externalScripts.js";
 import { emitMountedModuleScripts, parseImportMap } from "./importMaps.js";
@@ -16,7 +16,7 @@ import { resolve, relative, dirname, isAbsolute, sep } from "path";
 import { extractStandaloneEntryFromIndex, isTemplateEntry } from "./standaloneEntry.js";
 import { decodeCssEscapes, decodeWellFormedEscapes, encodeUrlPath, decodedUrlPath, splitUrlSuffix, } from "@hyperframes/parsers/asset-paths";
 import { CSS_URL_RE, isNonRelativeUrl } from "./assetPaths.js";
-import { transformSync } from "esbuild";
+import { transform } 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)
@@ -481,6 +481,7 @@ function countBundledAuthoredCompositionIds(hosts) {
             continue;
         counts.set(authoredCompositionId, (counts.get(authoredCompositionId) || 0) + 1);
     }
+    countPageRoot(counts, hosts);
     return counts;
 }
 // fallow-ignore-next-line complexity
@@ -651,7 +652,7 @@ function pushRun(runs, scene, chunk) {
     else
         runs.push({ scene, chunks: [chunk] });
 }
-function coalesceHeadStylesAndBodyScripts(document, provenance) {
+async function coalesceHeadStylesAndBodyScripts(document, provenance) {
     const allHeadStyles = [...document.querySelectorAll("head style")];
     const isScenePart = (el) => el.hasAttribute(SCENE_PART_ATTR);
     for (const run of allHeadStyles.length > 1 ? headStyleRuns(allHeadStyles, isScenePart) : []) {
@@ -669,7 +670,7 @@ function coalesceHeadStylesAndBodyScripts(document, provenance) {
         const mergedJs = joinJsChunks(members.map((el) => el.textContent || ""));
         if (mergedJs && !parsesAsScript(mergedJs)) {
             for (const el of members)
-                el.textContent = inlineScriptSource(el.textContent || "", provenance);
+                el.textContent = await inlineScriptSource(el.textContent || "", provenance);
             continue;
         }
         for (const el of members)
@@ -677,7 +678,7 @@ function coalesceHeadStylesAndBodyScripts(document, provenance) {
         if (!mergedJs)
             continue;
         const inlineScript = document.createElement("script");
-        inlineScript.textContent = inlineScriptSource(mergedJs, provenance);
+        inlineScript.textContent = await inlineScriptSource(mergedJs, provenance);
         if (anchor)
             anchor.before(inlineScript);
         else
@@ -740,11 +741,11 @@ export function parsesAsScript(source) {
         return false;
     }
 }
-function stripJsCommentsParserSafe(source, provenance) {
+async function stripJsCommentsParserSafe(source, provenance) {
     if (!source)
         return source;
     try {
-        const result = transformSync(source, {
+        const result = await transform(source, {
             loader: "js",
             minify: false,
             legalComments: "none",
@@ -763,8 +764,8 @@ function stripJsCommentsParserSafe(source, provenance) {
         return source;
     }
 }
-function inlineScriptSource(js, provenance) {
-    return escapeInlineScriptSource(stripJsCommentsParserSafe(js, provenance));
+async function inlineScriptSource(js, provenance) {
+    return escapeInlineScriptSource(await stripJsCommentsParserSafe(js, provenance));
 }
 function preserveLocalScriptIntegrity(doc, src, resolvePath) {
     const path = resolvePath(src);
@@ -1131,7 +1132,7 @@ async function bundleProject(projectDir, options) {
             if (scene)
                 script.setAttribute(SCENE_PART_ATTR, scene);
             script.textContent = skipsRunMerge
-                ? inlineScriptSource(text, options?.scriptProvenance)
+                ? await inlineScriptSource(text, options?.scriptProvenance)
                 : text;
             document.body.appendChild(script);
         }
@@ -1140,10 +1141,10 @@ async function bundleProject(projectDir, options) {
     emitRootCompositionVariableStyles(document, compVariablesByComp);
     enforceCompositionPixelSizing(document);
     autoHealMissingCompositionIds(document);
-    coalesceHeadStylesAndBodyScripts(document, options?.scriptProvenance);
+    await coalesceHeadStylesAndBodyScripts(document, options?.scriptProvenance);
     for (const el of document.querySelectorAll(`script[${INLINED_FILE_ATTR}]`)) {
         const js = el.textContent ?? "";
-        el.textContent = escapeInlineScriptSource(isJavaScriptType(el) ? stripJsCommentsParserSafe(js, options?.scriptProvenance) : js);
+        el.textContent = escapeInlineScriptSource(isJavaScriptType(el) ? await stripJsCommentsParserSafe(js, options?.scriptProvenance) : js);
     }
     deferScriptsUntilFonts(document, (el) => el.hasAttribute(RUNTIME_BOOTSTRAP_ATTR));
     injectTextRenderingRule(document);

package/dist/core.types.d.ts

@@ -65,6 +65,10 @@ export declare function parseFps(input: string | number): FpsParseResult;
  * errors — those still surface via the discriminated result.
  */
 export declare function parseFpsWithDefault(input: string | number | undefined): FpsParseResult;
+/** Integer rates the distributed renderer (Lambda, Cloud Run) accepts; fractional fps renders in-process only. */
+export declare const DISTRIBUTED_FPS: readonly [24, 25, 30, 60];
+export type DistributedFps = (typeof DISTRIBUTED_FPS)[number];
+export declare function isDistributedFps(value: unknown): value is DistributedFps;
 /** Video orientation / aspect ratio. */
 export type Orientation = "16:9" | "9:16";
 export type { Asset, TimelineElementType, MediaElementType, TimelineElementBase, TimelineMediaElement, WaveformData, TimelineTextElement, TimelineCompositionElement, CompositionVariableType, CompositionVariableBase, StringVariable, NumberVariable, ColorVariable, BooleanVariable, EnumVariable, CompositionVariable, CompositionSpec, TimelineElement, MediaFile, CanvasResolution, CompositionAPI, PlayerAPI, AddElementData, ValidationResult, CompositionAsset, Keyframe, KeyframeProperties, ElementKeyframes, StageZoom, StageZoomKeyframe, } from "@hyperframes/parsers";

package/dist/core.types.js

@@ -101,4 +101,9 @@ export function parseFpsWithDefault(input) {
         return { ok: true, value: { num: 30, den: 1 } };
     return parseFps(input);
 }
+/** Integer rates the distributed renderer (Lambda, Cloud Run) accepts; fractional fps renders in-process only. */
+export const DISTRIBUTED_FPS = [24, 25, 30, 60];
+export function isDistributedFps(value) {
+    return DISTRIBUTED_FPS.includes(value);
+}
 export { CANVAS_DIMENSIONS, VALID_CANVAS_RESOLUTIONS, normalizeResolutionFlag, isAspectAgnosticResolutionAlias, resolveResolutionFlagPair, checkOutputResolutionCompatibility, suggestMatchingPreset, COMPOSITION_VARIABLE_TYPES, TIMELINE_COLORS, DEFAULT_DURATIONS, getDefaultStageZoom, isTextElement, isMediaElement, isCompositionElement, } from "@hyperframes/parsers";