@hyperframes/parsers 0.8.193 → 0.8.195

package/dist/gsapParser.js

@@ -196,6 +196,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 serializeGsapAnimations(animations, timelineVar = "tl", options) {
   const sorted = [...animations].sort((a, b) => {
     const aNum = a.resolvedStart ?? (typeof a.position === "number" ? a.position : Number.MAX_SAFE_INTEGER);
@@ -1122,19 +1132,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 } : {}
   };

package/dist/gsapParserAcorn.js

@@ -52,6 +52,33 @@ function editabilityForProvenance(provenance) {
   if (provenance.kind === "runtime-dynamic") return "source";
   return "unroll";
 }
+function mergePercentageKeyframes(keyframes) {
+  const byPercentage = /* @__PURE__ */ new Map();
+  for (const keyframe of keyframes) {
+    const existing = byPercentage.get(keyframe.percentage);
+    if (!existing) {
+      byPercentage.set(keyframe.percentage, {
+        ...keyframe,
+        properties: { ...keyframe.properties }
+      });
+      continue;
+    }
+    existing.properties = { ...existing.properties, ...keyframe.properties };
+    if (keyframe.ease !== void 0) existing.ease = keyframe.ease;
+    if (keyframe.auto !== void 0) existing.auto = keyframe.auto;
+  }
+  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;
@@ -1357,19 +1384,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 } : {}
   };

package/dist/gsapParserExports.js

@@ -125,6 +125,33 @@ function editabilityForProvenance(provenance) {
   if (provenance.kind === "runtime-dynamic") return "source";
   return "unroll";
 }
+function mergePercentageKeyframes(keyframes) {
+  const byPercentage = /* @__PURE__ */ new Map();
+  for (const keyframe of keyframes) {
+    const existing = byPercentage.get(keyframe.percentage);
+    if (!existing) {
+      byPercentage.set(keyframe.percentage, {
+        ...keyframe,
+        properties: { ...keyframe.properties }
+      });
+      continue;
+    }
+    existing.properties = { ...existing.properties, ...keyframe.properties };
+    if (keyframe.ease !== void 0) existing.ease = keyframe.ease;
+    if (keyframe.auto !== void 0) existing.auto = keyframe.auto;
+  }
+  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;
@@ -1648,19 +1675,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 } : {}
   };

package/dist/gsapWriterAcorn.js

@@ -118,6 +118,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;
@@ -988,19 +998,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 } : {}
   };

package/dist/index.js

@@ -229,6 +229,33 @@ function editabilityForProvenance(provenance) {
   if (provenance.kind === "runtime-dynamic") return "source";
   return "unroll";
 }
+function mergePercentageKeyframes(keyframes) {
+  const byPercentage = /* @__PURE__ */ new Map();
+  for (const keyframe of keyframes) {
+    const existing = byPercentage.get(keyframe.percentage);
+    if (!existing) {
+      byPercentage.set(keyframe.percentage, {
+        ...keyframe,
+        properties: { ...keyframe.properties }
+      });
+      continue;
+    }
+    existing.properties = { ...existing.properties, ...keyframe.properties };
+    if (keyframe.ease !== void 0) existing.ease = keyframe.ease;
+    if (keyframe.auto !== void 0) existing.auto = keyframe.auto;
+  }
+  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;
@@ -1756,19 +1783,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 } : {}
   };

package/dist/referenceResolver.d.ts

@@ -1,6 +1,9 @@
 /** Minimal structural DOM shape the reference resolver needs. */
 interface RefResolverEl {
     getAttribute(name: string): string | null;
+    readonly parentElement?: RefResolverEl | null;
+    closest?(selector: string): RefResolverEl | null;
+    querySelectorAll?(selector: string): Iterable<RefResolverEl>;
 }
 interface RefResolverDoc {
     getElementById(id: string): RefResolverEl | null;

package/dist/referenceResolver.js

@@ -75,7 +75,18 @@ function parseStartExpression(raw) {
 }
 
 // src/referenceResolver.ts
-function findReferenceTargetEl(doc, refId) {
+function compositionScopeOf(el) {
+  return (el.getAttribute("data-composition-id") !== null ? el.parentElement : el)?.closest?.(
+    "[data-composition-id]"
+  ) ?? null;
+}
+function findReferenceTargetEl(doc, refId, from) {
+  const scope = compositionScopeOf(from);
+  if (scope) {
+    for (const candidate of scope.querySelectorAll?.(`[id="${refId}"]`) ?? []) {
+      if (compositionScopeOf(candidate) === scope) return candidate;
+    }
+  }
   return doc.getElementById(refId) ?? doc.querySelector(`[data-composition-id="${refId}"]`);
 }
 function resolveReferencedStart(doc, el, startCache, visiting) {
@@ -94,7 +105,7 @@ function resolveReferencedStart(doc, el, startCache, visiting) {
       startCache.set(el, value);
       return value;
     }
-    const target = findReferenceTargetEl(doc, expression.refId);
+    const target = findReferenceTargetEl(doc, expression.refId, el);
     if (!target) {
       startCache.set(el, 0);
       return 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperframes/parsers",
-  "version": "0.8.193",
+  "version": "0.8.195",
   "repository": {
     "type": "git",
     "url": "https://github.com/heygen-com/hyperframes",
@@ -135,7 +135,7 @@
     "tsx": "^4.21.0",
     "typescript": "^5.0.0",
     "vitest": "^4.1.11",
-    "@hyperframes/core": "0.8.193"
+    "@hyperframes/core": "0.8.195"
   },
   "scripts": {
     "build": "tsup",