hyperframes 0.8.193 → 0.8.194

package/dist/{chunk-7HTH5PFK.js → chunk-JVTWX5G3.js}

@@ -9,7 +9,7 @@ import {
   parseStrictFiniteTimingNumber,
   resolveNaturalMediaTimelineDuration,
   resolveTimedImageDurationSeconds
-} from "./chunk-USWPZXEA.js";
+} from "./chunk-2D5WP2NI.js";
 import {
   CANVAS_DIMENSIONS,
   isCompositionElement,
@@ -17,7 +17,7 @@ import {
   isTextElement,
   keyframesToGsapAnimations,
   serializeGsapAnimations
-} from "./chunk-2MCXIY4B.js";
+} from "./chunk-B7RJV74O.js";
 import {
   COMPOSITION_ATTRIBUTES,
   MEDIA_START_BASIS_ATTR,
@@ -152,12 +152,27 @@ function getStageStyles(resolution = "portrait") {
 
 // ../core/dist/gsapCdn.js
 var GSAP_CDN_VERSION = "3.15.0";
-function gsapCdnDist(gsapVersion) {
+var GSAP_CDN_BASE_URL = "https://cdn.jsdelivr.net/npm";
+var GSAP_BASE_URL_META = "hyperframes-gsap-base-url";
+function normalizeGsapBaseUrl(baseUrl) {
+  const value = baseUrl?.trim();
+  if (!value)
+    return GSAP_CDN_BASE_URL;
+  if (!/^https?:\/\//i.test(value) || !URL.canParse(value) || /[?#]/.test(value)) {
+    throw new Error("GSAP base URL must be an absolute HTTP(S) URL without a query or fragment");
+  }
+  const url = new URL(value);
+  if (url.username || url.password) {
+    throw new Error("GSAP base URL must not contain credentials");
+  }
+  return url.href.replace(/\/+$/, "");
+}
+function gsapCdnDist(gsapVersion, baseUrl) {
   const version = gsapVersion && /^\d+(\.\d+)*$/.test(gsapVersion) ? gsapVersion : GSAP_CDN_VERSION;
-  return `https://cdn.jsdelivr.net/npm/gsap@${version}/dist/`;
+  return `${normalizeGsapBaseUrl(baseUrl)}/gsap@${version}/dist/`;
 }
-function motionPathPluginUrl(gsapVersion) {
-  return `${gsapCdnDist(gsapVersion)}MotionPathPlugin.min.js`;
+function motionPathPluginUrl(gsapVersion, baseUrl) {
+  return `${gsapCdnDist(gsapVersion, baseUrl)}MotionPathPlugin.min.js`;
 }
 
 // ../core/dist/templates/constants.js
@@ -4444,7 +4459,15 @@ function createRuntimeStartTimeResolver(params) {
   const startCache = /* @__PURE__ */ new WeakMap();
   const durationCache = /* @__PURE__ */ new WeakMap();
   const visiting = /* @__PURE__ */ new Set();
-  const findReferenceTarget = (refId) => {
+  const compositionScopeOf = (element) => (element.hasAttribute("data-composition-id") ? element.parentElement : element)?.closest("[data-composition-id]") ?? null;
+  const findReferenceTarget = (refId, from) => {
+    const scope = compositionScopeOf(from);
+    if (scope) {
+      for (const candidate of scope.querySelectorAll(`[id="${refId}"]`)) {
+        if (compositionScopeOf(candidate) === scope)
+          return candidate;
+      }
+    }
     const byId = doc.getElementById(refId);
     if (byId)
       return byId;
@@ -4496,7 +4519,7 @@ function createRuntimeStartTimeResolver(params) {
     if (expression.kind === "absolute") {
       return resolveHostOffsetForElement(element, fallback) + Math.max(0, expression.value);
     }
-    const target = findReferenceTarget(expression.refId);
+    const target = findReferenceTarget(expression.refId, element);
     if (!target)
       return fallback;
     const targetStart = resolveStartForElementInternal(target, 0);
@@ -5530,6 +5553,8 @@ export {
   isDistributedFps,
   generateBaseHtml,
   getStageStyles,
+  GSAP_BASE_URL_META,
+  normalizeGsapBaseUrl,
   gsapCdnDist,
   motionPathPluginUrl,
   GSAP_CDN,

package/dist/{chunk-UNATIAOT.js → chunk-JXTPNUSO.js}

@@ -19,7 +19,7 @@ import {
   splitElementInHtml,
   unwrapElementsFromHtml,
   wrapElementsInHtml
-} from "./chunk-XQPA4W3M.js";
+} from "./chunk-JU4T4VAA.js";
 import {
   MEDIA_LINK_ATTR,
   relinkSplitHalves
@@ -32,7 +32,7 @@ import {
   requestedProjectPath,
   requiredFfmpeg,
   resolveLocalAudioPath
-} from "./chunk-FBVUAH7N.js";
+} from "./chunk-2OYYNKJ4.js";
 import {
   HistoryBusyError,
   MAX_WINDOW_IDLE_MS,
@@ -46,7 +46,7 @@ import {
   resolveProjectAndSignature,
   resolveProjectSignature,
   settledFileTag
-} from "./chunk-C4Y3ZREE.js";
+} from "./chunk-OJNNKHAZ.js";
 import {
   PROXY_PARAMS_VERSION,
   PROXY_PENDING_RETRY_AFTER_SECONDS,
@@ -68,7 +68,7 @@ import {
   scanProjectMediaCodecMap,
   shouldPrewarmProxy,
   waitForProxy
-} from "./chunk-7YSFE4SZ.js";
+} from "./chunk-MCFPMUMT.js";
 import {
   STUDIO_MOTION_PATH,
   createStudioMotionRenderBodyScript,
@@ -83,7 +83,7 @@ import {
 import {
   findTimelineScript,
   parseGsapScriptAcorn
-} from "./chunk-E3P3LJG6.js";
+} from "./chunk-FLREUEHW.js";
 import {
   atomicTempPath,
   createFileAtomically,
@@ -102,19 +102,21 @@ import {
   locateSystemFont
 } from "./chunk-7FMUTGOH.js";
 import {
+  GSAP_BASE_URL_META,
   PREVIEW_PROXY_BOX_PARAM,
   formatPreviewProxyBox,
   formatRenderOutputTimestamp,
   gsapCdnDist,
   motionPathPluginUrl,
+  normalizeGsapBaseUrl,
   parseFps,
   parsePreviewProxyBox
-} from "./chunk-7HTH5PFK.js";
+} from "./chunk-JVTWX5G3.js";
 import {
   addScenePartsManifest,
   ensureHfIds,
   stampHfIdsInPlace
-} from "./chunk-3W4B6G7Y.js";
+} from "./chunk-GAFEU6AB.js";
 import {
   AFTER_FONTS_SCRIPT_TYPE,
   RUNTIME_BOOTSTRAP_ATTR,
@@ -128,7 +130,7 @@ import {
   resolveRateSpec,
   sourceTimeAt,
   stripEmbeddedRuntimeScripts
-} from "./chunk-USWPZXEA.js";
+} from "./chunk-2D5WP2NI.js";
 import {
   HTML_ATTRIBUTE_ENTITIES,
   MagicString,
@@ -136,7 +138,7 @@ import {
   decodeAuthoredAttribute,
   scanHtmlOpeningTags,
   unrollComputedTimeline
-} from "./chunk-2MCXIY4B.js";
+} from "./chunk-B7RJV74O.js";
 import {
   ProjectRootMissingError,
   folderGone,
@@ -559,6 +561,16 @@ function mergePercentageKeyframes(keyframes) {
   }
   return [...byPercentage.values()].sort((a, b) => a.percentage - b.percentage);
 }
+function distributeArrayKeyframes(channels) {
+  return mergePercentageKeyframes(
+    [...channels].flatMap(
+      ([key, values]) => values.map((value, index) => ({
+        percentage: values.length > 1 ? Math.round(index / (values.length - 1) * 100) : 0,
+        properties: { [key]: value }
+      }))
+    )
+  );
+}
 function buildArcPath(coords, curviness, autoRotate, isCubic) {
   const first = coords[0];
   if (coords.length < 2 || !first) return void 0;
@@ -1419,19 +1431,9 @@ function parseSimpleArrayKeyframes(node, scope) {
       easeEach = tryResolveStringProp(prop.value, scope) ?? easeEach;
     }
   }
-  const maxLen = Math.max(...[...arrayProps.values()].map((a) => a.length), 0);
-  const keyframes = [];
-  for (let i = 0; i < maxLen; i++) {
-    const percentage = maxLen > 1 ? Math.round(i / (maxLen - 1) * 100) : 0;
-    const properties = {};
-    for (const [key, values] of arrayProps) {
-      if (i < values.length) properties[key] = values[i];
-    }
-    keyframes.push({ percentage, properties });
-  }
   return {
     format: "simple-array",
-    keyframes,
+    keyframes: distributeArrayKeyframes(arrayProps),
     ...ease ? { ease } : {},
     ...easeEach ? { easeEach } : {}
   };
@@ -3875,7 +3877,7 @@ function tagRootCompositionFile(bodyHtml, compPath) {
 function rootHeadContent(rootHtml) {
   return rootHtml.match(/<head[^>]*>([\s\S]*?)<\/head>/i)?.[1] ?? "";
 }
-function buildSubCompositionHtml(projectDir, compPath, runtimeUrl, baseHref, rawOverride) {
+function buildSubCompositionHtml(projectDir, compPath, runtimeUrl, baseHref, rawOverride, gsapBaseUrl) {
   const compFile = join22(projectDir, compPath);
   if (!existsSync(compFile)) return null;
   const rawComp = rawOverride ?? readFileSync3(compFile, "utf-8");
@@ -3927,7 +3929,7 @@ ${compHeadContent}`;
 <script ${RUNTIME_BOOTSTRAP_ATTR}="1" src="${runtimeUrl}"></script>`;
   if (!headContent.includes("gsap")) {
     headContent += `
-<script src="${gsapCdnDist()}gsap.min.js"></script>`;
+<script src="${gsapCdnDist(void 0, gsapBaseUrl).replace(/&/g, "&amp;")}gsap.min.js"></script>`;
   }
   const htmlOpen = htmlAttrs ? `<html ${htmlAttrs}>` : "<html>";
   const bodyOpen = bodyAttrs ? `<body ${bodyAttrs}>` : "<body>";
@@ -4641,7 +4643,7 @@ function resolveGsapWriter(env) {
   throw new Error(`Invalid ${GSAP_WRITER_MIGRATION.flag}=${configured}; expected recast or acorn`);
 }
 async function loadGsapParser() {
-  return import("./gsapParser-UP3PNPC2.js");
+  return import("./gsapParser-IEUSLYDJ.js");
 }
 function isDanglingSymlinkInProject(projectDir, lexicalPath) {
   if (!isSafePath(projectDir, dirname3(lexicalPath))) return false;
@@ -5500,7 +5502,7 @@ async function prepareGsapMutationScript(c, res, firstMutation) {
   let block = extractGsapScriptBlock(html);
   if (!block && (firstMutation.type === "add" || firstMutation.type === "add-with-keyframes")) {
     const compId = html.match(/data-composition-id="([^"]+)"/)?.[1] ?? "main";
-    const { GSAP_CDN } = await import("./dist-RKK4YLAD.js");
+    const { GSAP_CDN } = await import("./dist-2YTN2UGY.js");
     const bootstrap = [
       `<script src="${GSAP_CDN}"></script>`,
       "<script>",
@@ -7375,9 +7377,12 @@ function lazyPreviewImages(html) {
   return parts.join("");
 }
 var PROJECT_SIGNATURE_META = "hyperframes-project-signature";
-var GSAP_CDN_SCRIPT = `<script src="${gsapCdnDist()}gsap.min.js"></script>`;
-var GSAP_CUSTOM_EASE_CDN_SCRIPT = `<script src="${gsapCdnDist()}CustomEase.min.js"></script>`;
-var GSAP_MOTION_PATH_CDN_SCRIPT = `<script src="${motionPathPluginUrl()}"></script>`;
+function escapeGsapUrl(url) {
+  return url.replace(/&/g, "&amp;").replace(/"/g, "&quot;");
+}
+function gsapScriptTag(file, baseUrl) {
+  return `<script src="${escapeGsapUrl(gsapCdnDist(void 0, baseUrl) + file)}"></script>`;
+}
 function injectProjectSignature(html, signature) {
   const tag = `<meta name="${PROJECT_SIGNATURE_META}" content="${signature}">`;
   if (html.includes(`name="${PROJECT_SIGNATURE_META}"`)) {
@@ -7433,16 +7438,16 @@ function htmlUsesMotionPath(html) {
 function htmlHasMotionPathPlugin(html) {
   return /<script\b[^>]*src=["'][^"']*MotionPathPlugin/i.test(html) || /\bwindow\.MotionPathPlugin\b/.test(html) || /\bMotionPathPlugin\s*=\s*/.test(html);
 }
-function injectMotionPathPluginIfNeeded(html) {
+function injectMotionPathPluginIfNeeded(html, baseUrl) {
   if (!htmlUsesMotionPath(html) || htmlHasMotionPathPlugin(html)) return html;
   const gsap = findGsapCoreScript(html);
   if (gsap) {
     const version = gsap.src.match(/gsap@([\d.]+)/)?.[1];
     const ordering = `${gsap.type ? ` type="${gsap.type}"` : ""}${gsap.defer ? " defer" : ""}`;
-    const pluginTag = `<script${ordering} src="${motionPathPluginUrl(version)}"></script>`;
+    const pluginTag = `<script${ordering} src="${escapeGsapUrl(motionPathPluginUrl(version, baseUrl))}"></script>`;
     return html.slice(0, gsap.end) + "\n" + pluginTag + html.slice(gsap.end);
   }
-  return injectScriptTagIntoHead(html, GSAP_MOTION_PATH_CDN_SCRIPT);
+  return injectScriptTagIntoHead(html, gsapScriptTag("MotionPathPlugin.min.js", baseUrl));
 }
 function isGsapCoreUrl(src) {
   const base = "http://localhost/";
@@ -7475,30 +7480,32 @@ function scriptCloseEnd(html, start) {
   const closeAt = close.exec(html)?.index;
   return closeAt === void 0 ? 0 : html.indexOf(">", closeAt) + 1;
 }
-function injectStudioMotionDependencies(html, manifestContent) {
+function injectStudioMotionDependencies(html, manifestContent, baseUrl) {
   const manifest = parseStudioMotionManifestContent(manifestContent);
   if (!manifest.hasMotion) return html;
   let next = html;
-  if (!htmlHasGsap(next)) next = injectScriptTagIntoHead(next, GSAP_CDN_SCRIPT);
+  if (!htmlHasGsap(next))
+    next = injectScriptTagIntoHead(next, gsapScriptTag("gsap.min.js", baseUrl));
   if (manifest.hasCustomEase && !htmlHasCustomEase(next)) {
-    next = injectScriptTagIntoHead(next, GSAP_CUSTOM_EASE_CDN_SCRIPT);
+    next = injectScriptTagIntoHead(next, gsapScriptTag("CustomEase.min.js", baseUrl));
   }
   return next;
 }
-function injectStudioMotionScript(html, projectDir, activeCompositionPath) {
+function injectStudioMotionScript(html, projectDir, activeCompositionPath, baseUrl) {
   const manifestContent = readStudioMotionManifestContent(projectDir);
   const script = createStudioMotionRenderBodyScript(manifestContent, {
     activeCompositionPath
   });
   if (!script) return html;
-  const withDependencies = injectStudioMotionDependencies(html, manifestContent);
+  const withDependencies = injectStudioMotionDependencies(html, manifestContent, baseUrl);
   const tag = `<script type="${AFTER_FONTS_SCRIPT_TYPE}">${script.replace(/<\/script/gi, "<\\/script")}</script>`;
   return insertBeforeCloseTag(withDependencies, "body", tag) ?? `${withDependencies}${tag}`;
 }
 var GSAP_FALLBACK_ATTR = "data-hf-gsap-fallback";
-var GSAP_CDN_FALLBACK_SCRIPT = `<script ${GSAP_FALLBACK_ATTR}>
+function gsapCdnFallbackScript(baseUrl) {
+  return `<script ${GSAP_FALLBACK_ATTR}>
 (function(){
-  var cdnBase="${gsapCdnDist()}";
+  var cdnBase=${JSON.stringify(gsapCdnDist(void 0, baseUrl)).replace(/</g, "\\u003c")};
   var loaded={};
   function loadFallback(file){
     if(loaded[file])return loaded[file];
@@ -7518,10 +7525,12 @@ var GSAP_CDN_FALLBACK_SCRIPT = `<script ${GSAP_FALLBACK_ATTR}>
   },true);
 })();
 </script>`;
-function injectGsapCdnFallback(html) {
+}
+function injectGsapCdnFallback(html, baseUrl) {
   if (html.includes(GSAP_FALLBACK_ATTR)) return html;
-  if (html.includes("<head>")) return html.replace("<head>", "<head>" + GSAP_CDN_FALLBACK_SCRIPT);
-  return GSAP_CDN_FALLBACK_SCRIPT + html;
+  if (html.includes("<head>"))
+    return html.replace("<head>", "<head>" + gsapCdnFallbackScript(baseUrl));
+  return gsapCdnFallbackScript(baseUrl) + html;
 }
 function parsePreviewVariablesParam(raw) {
   if (raw === void 0 || raw === "") return { ok: true, values: null };
@@ -7548,8 +7557,8 @@ function previewVariablesFromRequest(rawVariables) {
 var PREVIEW_CAPTURE_PARAM = "hf-capture";
 var EARLY_ERRORS_SCRIPT = `<script>(function(){var seen=window.${STUDIO_PREVIEW_ERRORS}=[];
 addEventListener("error",function(e){seen.push(e.message||String(e))});})();</script>`;
-function injectStudioPreviewAugmentations(html, adapter, projectDir, activeCompositionPath, capture) {
-  const marked = capture ? injectTagsAtHeadStart(
+function injectStudioPreviewAugmentations(html, adapter, projectDir, activeCompositionPath, options) {
+  const marked = options.capture ? injectTagsAtHeadStart(
     html,
     `<meta name="${STUDIO_PREVIEW_MARK_META}" content="${STUDIO_PREVIEW_CAPTURE_MODE}">`
   ) : injectTagsAtHeadStart(
@@ -7559,11 +7568,20 @@ function injectStudioPreviewAugmentations(html, adapter, projectDir, activeCompo
   return injectStudioMotionScript(
     injectMotionPathPluginIfNeeded(
       injectGsapCdnFallback(
-        injectProjectSignature(marked, resolveProjectSignature(adapter, projectDir))
-      )
+        injectProjectSignature(
+          injectTagsAtHeadStart(
+            marked,
+            `<meta name="${GSAP_BASE_URL_META}" content="${escapeGsapUrl(options.gsapBaseUrl)}">`
+          ),
+          resolveProjectSignature(adapter, projectDir)
+        ),
+        options.gsapBaseUrl
+      ),
+      options.gsapBaseUrl
     ),
     projectDir,
-    activeCompositionPath
+    activeCompositionPath,
+    options.gsapBaseUrl
   );
 }
 async function transformPreviewHtml(html, adapter, project, activeCompositionPath) {
@@ -7607,6 +7625,16 @@ var PREVIEW_BUNDLE_OPTIONS = {
 var previewBaseHref = (projectId) => `/api/projects/${encodeURIComponent(projectId)}/preview/`;
 var withPreviewBase = (html, projectId) => hasBaseElement(html) ? html : injectTagsAtHeadStart(html, `<base href="${previewBaseHref(projectId)}">`);
 function registerPreviewRoutes(api, adapter) {
+  let gsapBaseUrl;
+  try {
+    gsapBaseUrl = normalizeGsapBaseUrl(process.env.HYPERFRAMES_GSAP_BASE_URL);
+  } catch (cause) {
+    throw new Error(
+      "Invalid HYPERFRAMES_GSAP_BASE_URL: use an absolute HTTP(S) npm mirror root without credentials, query, or fragment",
+      { cause }
+    );
+  }
+  const gsapEtagSalt = `:gsap:${createHash22("sha1").update(gsapBaseUrl).digest("hex").slice(0, 12)}`;
   const previewCacheHeaders = (etag) => ({
     "Cache-Control": "private, no-cache",
     ETag: etag
@@ -7641,7 +7669,7 @@ function registerPreviewRoutes(api, adapter) {
         adapter,
         project.dir,
         mainCompositionPath,
-        capture
+        { capture, gsapBaseUrl }
       );
       if (previewVariables) bundled = injectPreviewVariables(bundled, previewVariables);
       bundled = await injectMediaCodecMap(
@@ -7669,7 +7697,7 @@ function registerPreviewRoutes(api, adapter) {
           adapter,
           project.dir,
           fallback.compositionPath,
-          capture
+          { capture, gsapBaseUrl }
         );
         if (previewVariables) {
           fallbackAugmented = injectPreviewVariables(fallbackAugmented, previewVariables);
@@ -7694,7 +7722,7 @@ function registerPreviewRoutes(api, adapter) {
     if (vars.error !== void 0) return c.json({ error: vars.error }, 400);
     const previewVariables = vars.values;
     const capture = c.req.query(PREVIEW_CAPTURE_PARAM) !== void 0;
-    const etag = `"preview:${signature}${variablesEtagSalt(vars.raw)}${capture ? ":capture" : ""}"`;
+    const etag = `"preview:${signature}${gsapEtagSalt}${variablesEtagSalt(vars.raw)}${capture ? ":capture" : ""}"`;
     const ifNoneMatch = c.req.header("If-None-Match");
     if (ifNoneMatch === etag) {
       return new Response(null, {
@@ -7744,7 +7772,7 @@ ${etag}`;
     }
     const compPathHash = createHash22("sha1").update(compPath).digest("hex");
     const capture = c.req.query(PREVIEW_CAPTURE_PARAM) !== void 0;
-    const etag = `"comp:v2:${compPathHash}:${signature}${variablesEtagSalt(vars.raw)}${capture ? ":capture" : ""}"`;
+    const etag = `"comp:v2:${compPathHash}:${signature}${gsapEtagSalt}${variablesEtagSalt(vars.raw)}${capture ? ":capture" : ""}"`;
     const ifNoneMatch = c.req.header("If-None-Match");
     if (ifNoneMatch === etag) {
       return new Response(null, {
@@ -7760,12 +7788,16 @@ ${etag}`;
       compPath,
       adapter.runtimeUrl,
       baseHref,
-      stamped
+      stamped,
+      gsapBaseUrl
     );
     if (!html) return c.text("not found", 404);
     recordPreviewReferences(project.dir, html);
     html = ensureHfIds(await transformPreviewHtml(html, adapter, project, compPath));
-    html = injectStudioPreviewAugmentations(html, adapter, project.dir, compPath, capture);
+    html = injectStudioPreviewAugmentations(html, adapter, project.dir, compPath, {
+      capture,
+      gsapBaseUrl
+    });
     if (previewVariables) html = injectPreviewVariables(html, previewVariables);
     html = await injectMediaCodecMap(html, adapter, project.dir, compPath, mediaCodecProbeCache);
     return c.html(html, 200, previewCacheHeaders(etag));