@hyperframes/parsers 0.8.127 → 0.8.129

package/dist/index.d.ts

@@ -1,7 +1,8 @@
 import { C as CompositionVariable, T as TimelineElement, a as CanvasResolution, K as Keyframe, S as StageZoomKeyframe, V as ValidationResult } from './types-Ejqndkej.js';
 export { A as AddElementData, b as Asset, B as BooleanVariable, c as CANVAS_DIMENSIONS, d as COMPOSITION_VARIABLE_TYPES, e as ColorVariable, f as CompositionAPI, g as CompositionAsset, h as CompositionSpec, i as CompositionVariableBase, j as CompositionVariableType, D as DEFAULT_DURATIONS, E as ElementKeyframes, k as EnumVariable, F as FontVariable, I as ImageVariable, l as KeyframeProperties, M as MediaElementType, m as MediaFile, N as NumberVariable, P as PlayerAPI, R as ResolvedResolutionFlag, n as StageZoom, o as StringVariable, p as TIMELINE_COLORS, q as TimelineCompositionElement, r as TimelineElementBase, s as TimelineElementType, t as TimelineMediaElement, u as TimelineTextElement, v as VALID_CANVAS_RESOLUTIONS, W as WaveformData, w as getDefaultStageZoom, x as isAspectAgnosticResolutionAlias, y as isCompositionElement, z as isMediaElement, G as isTextElement, H as normalizeResolutionFlag, J as resolveResolutionFlagPair } from './types-Ejqndkej.js';
-export { A as ArcPathConfig, a as ArcPathSegment, G as GsapAnimation, b as GsapKeyframesData, c as GsapMethod, d as GsapPercentageKeyframe, e as GsapProvenance, f as GsapProvenanceKind, K as KeyframeEditability, P as PROPERTY_GROUPS, g as ParsedGsap, h as PropertyGroupName, S as SUPPORTED_EASES, i as SUPPORTED_PROPS, j as SourcedGsapPercentageKeyframe, k as SplitAnimationsOptions, l as SplitAnimationsResult, m as classifyPropertyGroup, n as classifyTweenPropertyGroup, o as editabilityForProvenance, p as getAnimationsForElementId, q as gsapAnimationsToKeyframes, r as keyframesToGsapAnimations, s as serializeGsapAnimations, v as validateCompositionGsap } from './gsapSerialize-CFUDcLqX.js';
+export { A as ArcPathConfig, b as ArcPathSegment, u as GSAP_DEFAULT_DURATION, a as GsapAnimation, h as GsapKeyframesData, G as GsapMethod, i as GsapPercentageKeyframe, c as GsapProvenance, d as GsapProvenanceKind, K as KeyframeEditability, j as PROPERTY_GROUPS, P as ParsedGsap, k as PropertyGroupName, S as SUPPORTED_EASES, l as SUPPORTED_PROPS, w as SourcedGsapPercentageKeyframe, r as SplitAnimationsOptions, t as SplitAnimationsResult, m as classifyPropertyGroup, n as classifyTweenPropertyGroup, f as editabilityForProvenance, o as getAnimationsForElementId, p as gsapAnimationsToKeyframes, q as keyframesToGsapAnimations, s as serializeGsapAnimations, v as validateCompositionGsap } from './gsapSerialize-CfSXM_Ez.js';
 export { isStudioHoldSet } from './gsapParser.js';
+export { getObjectArrayKeyframeTiming } from './gsapParserExports.js';
 export { SPRING_PRESETS, SpringPreset, generateSpringEaseData } from './springEase.js';
 export { parseGsapScriptAcorn as parseGsapScript } from './gsapParserAcorn.js';
 export { EXCLUDED_TAGS, ensureHfIds, isCompositionTemplate, mintHfId, walkCompositionDescendants } from './hfIds.js';

package/dist/index.js

@@ -88,6 +88,7 @@ function getDefaultStageZoom(resolution) {
 }
 
 // src/gsapConstants.ts
+var GSAP_DEFAULT_DURATION = 0.5;
 var SUPPORTED_PROPS = [
   // 2D Transforms
   "x",
@@ -434,28 +435,20 @@ import { parse as babelParse } from "@babel/parser";
 // src/gsapObjectArrayTiming.ts
 var roundPercentage = (percentage) => Math.round(percentage * 10) / 10;
 function getObjectArrayKeyframeTiming(durations) {
-  const hasAuthoredDuration = durations.some((duration) => duration !== void 0);
-  if (hasAuthoredDuration) {
-    if (!durations.every(
-      (duration) => typeof duration === "number" && Number.isFinite(duration) && duration > 0
-    )) {
-      return null;
-    }
-    const totalDuration = durations.reduce((sum, duration) => sum + duration, 0);
-    let cumulative = 0;
-    return {
-      percentages: durations.map((duration) => {
-        cumulative += duration;
-        return roundPercentage(cumulative / totalDuration * 100);
-      }),
-      totalDuration
-    };
+  const steps = durations.map((duration) => duration ?? GSAP_DEFAULT_DURATION);
+  if (!steps.every(
+    (duration) => typeof duration === "number" && Number.isFinite(duration) && duration > 0
+  )) {
+    return null;
   }
-  const lastIndex = durations.length - 1;
+  const totalDuration = steps.reduce((sum, duration) => sum + duration, 0);
+  let cumulative = 0;
   return {
-    percentages: durations.map(
-      (_, index) => lastIndex > 0 ? roundPercentage(index / lastIndex * 100) : 0
-    )
+    percentages: steps.map((duration) => {
+      cumulative += duration;
+      return roundPercentage(cumulative / totalDuration * 100);
+    }),
+    totalDuration
   };
 }
 
@@ -1628,6 +1621,7 @@ function parsePercentageKeyframes(node, scope, source) {
     if (typeof key !== "string") continue;
     const pctMatch = PERCENTAGE_KEY_RE.exec(key);
     if (pctMatch) {
+      if (!isPlainStep(prop.value)) return void 0;
       const percentage = Number.parseFloat(pctMatch[1] ?? "0");
       const record = objectExpressionToRecord(prop.value, scope, source);
       const properties = {};
@@ -1646,6 +1640,8 @@ function parsePercentageKeyframes(node, scope, source) {
       ease = tryResolveStringProp(prop.value, scope, source) ?? ease;
     } else if (key === "easeEach") {
       easeEach = tryResolveStringProp(prop.value, scope, source) ?? easeEach;
+    } else {
+      return void 0;
     }
   }
   keyframes.sort((a, b) => a.percentage - b.percentage);
@@ -1669,12 +1665,19 @@ function computeKeyframesTotalDuration(varsNode, scope, source) {
   }
   return getObjectArrayKeyframeTiming(durations)?.totalDuration;
 }
-var isFullyReadableStep = (el) => el?.type === "ObjectExpression" && !el.properties.some((p) => p.type === "SpreadElement");
+function staticKeyName(prop) {
+  if (prop.type !== "ObjectProperty" && prop.type !== "Property") return void 0;
+  if (prop.method || prop.kind && prop.kind !== "init") return void 0;
+  const key = prop.computed ? prop.key?.type === "Literal" && prop.key.value : prop.key?.name ?? prop.key?.value;
+  return typeof key === "string" ? key : void 0;
+}
+var isPlainObject = (node) => node?.type === "ObjectExpression" && (node.properties ?? []).every((p) => staticKeyName(p) !== void 0);
+var isPlainStep = (node) => node?.type === "Literal" || isPlainObject(node);
 function parseObjectArrayKeyframes(node, scope, source) {
   const elements = node.elements ?? [];
   const raw = [];
   for (const el of elements) {
-    if (!isFullyReadableStep(el)) return void 0;
+    if (!isPlainObject(el)) return void 0;
     const record = objectExpressionToRecord(el, scope, source);
     const properties = {};
     let duration;
@@ -1713,9 +1716,8 @@ function parseSimpleArrayKeyframes(node, scope) {
       const values = [];
       for (const el of prop.value.elements ?? []) {
         const val = resolveNode(el, scope);
-        if (typeof val === "number" || typeof val === "string") {
-          values.push(val);
-        }
+        if (typeof val !== "number" && typeof val !== "string") return void 0;
+        values.push(val);
       }
       if (values.length > 0) arrayProps.set(key, values);
     } else if (key === "ease") {
@@ -1748,6 +1750,7 @@ function parseKeyframesNode(node, scope, source) {
   }
   if (node.type !== "ObjectExpression") return void 0;
   const props = node.properties ?? [];
+  if (!props.every((p) => staticKeyName(p) !== void 0)) return void 0;
   let hasPercentageKey = false;
   let hasArrayValue = false;
   for (const prop of props) {
@@ -1848,7 +1851,7 @@ function tweenCallToAnimation(call, scope, source, identifierBindings) {
         percentage: waypoints.length > 1 ? Math.round(i / (waypoints.length - 1) * 100) : 0,
         properties: { x: wp.x, y: wp.y }
       }));
-      keyframesData = { format: "percentage", keyframes: kf };
+      keyframesData = { format: "percentage", keyframes: kf, fromMotionPath: true };
     } else {
       const kfs = keyframesData.keyframes;
       if (kfs.length === waypoints.length) {
@@ -1878,10 +1881,10 @@ function tweenCallToAnimation(call, scope, source, identifierBindings) {
   const position = typeof posVal === "number" ? posVal : typeof posVal === "string" ? posVal : hasPositionArg ? `__raw:${source.slice(call.positionArg.start, call.positionArg.end)}` : 0;
   let duration = typeof vars.duration === "number" ? vars.duration : void 0;
   const ease = typeof vars.ease === "string" ? vars.ease : void 0;
-  if (duration === void 0 && keyframesData) {
+  const durationUnresolved = call.method !== "set" && duration === void 0 && hasUnknownDuration(call.varsArg, scope);
+  if (duration === void 0 && keyframesData && !durationUnresolved) {
     duration = computeKeyframesTotalDuration(call.varsArg, scope, source);
   }
-  const durationUnresolved = call.method !== "set" && duration === void 0 && hasUnknownDuration(call.varsArg, scope);
   let selector = call.selector;
   let targetIdentity;
   if (selector === "__unresolved__") {
@@ -1976,7 +1979,6 @@ function annotateStaggeredCollections(anims) {
     anim.keyframes = { format: "percentage", keyframes: staggeredKeyframes(anim, each) };
   }
 }
-var GSAP_DEFAULT_DURATION = 0.5;
 function resolvePositionString(pos, cursor, prevStart) {
   const trimmed = pos.trim();
   if (trimmed === "") return cursor;
@@ -2058,7 +2060,7 @@ function applyTimelineDefaults(anims, defaults) {
       if (defaults.duration !== void 0) anim.duration = defaults.duration;
       else if (defaults.durationUnresolved) anim.durationUnresolved = true;
     }
-    if (anim.ease === void 0 && defaults.ease !== void 0 && !anim.keyframes) {
+    if (anim.ease === void 0 && defaults.ease !== void 0 && (!anim.keyframes || anim.keyframes.fromMotionPath)) {
       anim.ease = defaults.ease;
     }
   }
@@ -3669,7 +3671,7 @@ var collectHelperBodies = (statements) => new Map(statements.flatMap(declaredFun
 function dropStatementsUnsafeToUnroll(byStatement, ctx) {
   for (const [stmt, anims] of byStatement) {
     const unknownTiming = anims.some(
-      (a) => a.durationUnresolved || a.resolvedStart === void 0 || a.hasUnresolvedSelector
+      (a) => a.durationUnresolved || a.resolvedStart === void 0 || a.hasUnresolvedSelector || a.hasUnresolvedKeyframes
     );
     const bodyStmts = unknownTiming ? null : bodyOf(stmt, ctx.helpers);
     if (bodyStmts === null || !onlyAddsTweens(bodyStmts, ctx)) byStatement.delete(stmt);
@@ -4264,6 +4266,7 @@ export {
   EXCLUDED_TAGS,
   FONT_ALIAS_KEYS,
   FONT_ALIAS_MAP,
+  GSAP_DEFAULT_DURATION,
   HTML_BODY_CSS_HEIGHT_FIRST_RE,
   HTML_BODY_CSS_WIDTH_FIRST_RE,
   LEGACY_TIMING_ATTRIBUTES,
@@ -4292,6 +4295,7 @@ export {
   generateSpringEaseData,
   getAnimationsForElementId,
   getDefaultStageZoom,
+  getObjectArrayKeyframeTiming,
   gsapAnimationsToKeyframes,
   isAspectAgnosticResolutionAlias,
   isCompositionElement,