@hyperframes/parsers 0.8.115 → 0.8.117

package/dist/{gsapSerialize-g8oprts9.d.ts → gsapSerialize-CVwsMItk.d.ts}

@@ -15,6 +15,11 @@ type PositionWrite = Pick<GsapAnimation, "propertyGroup" | "properties" | "fromP
 declare function isXYPositionWrite(a: PositionWrite): boolean;
 declare function classifyPropertyGroup(prop: string): PropertyGroupName;
 declare function classifyTweenPropertyGroup(properties: Record<string, unknown>): PropertyGroupName | undefined;
+/**
+ * What a Studio hold pins from t=0 before a later keyframed tween: its first keyframe's position props,
+ * minus those an earlier timeline tween on the target writes (a global `gsap.set` is a base value).
+ */
+declare function positionHoldForAnimation(animation: GsapAnimation, animations: readonly GsapAnimation[]): Record<string, number> | null;
 declare const SUPPORTED_EASES: string[];
 
 /**
@@ -203,4 +208,4 @@ declare function gsapAnimationsToKeyframes(animations: GsapAnimation[], elementS
     skipBaseSet?: boolean;
 }): Keyframe[];
 
-export { type ArcPathConfig as A, type GsapAnimation as G, type KeyframeEditability as K, type MotionPathShape as M, PROPERTY_GROUPS as P, SUPPORTED_EASES as S, type ArcPathSegment as a, type GsapKeyframesData as b, type GsapMethod as c, type GsapPercentageKeyframe as d, type GsapProvenance as e, type GsapProvenanceKind as f, type ParsedGsap as g, type PropertyGroupName as h, SUPPORTED_PROPS as i, type SourcedGsapPercentageKeyframe as j, type SplitAnimationsOptions as k, type SplitAnimationsResult as l, classifyPropertyGroup as m, classifyTweenPropertyGroup as n, editabilityForProvenance as o, getAnimationsForElementId as p, gsapAnimationsToKeyframes as q, keyframesToGsapAnimations as r, serializeGsapAnimations as s, buildArcPath as t, type GsapKeyframeFormat as u, validateCompositionGsap as v, isXYPositionWrite as w };
+export { type ArcPathConfig as A, type GsapAnimation as G, type KeyframeEditability as K, type MotionPathShape as M, PROPERTY_GROUPS as P, SUPPORTED_EASES as S, type ArcPathSegment as a, type GsapKeyframesData as b, type GsapMethod as c, type GsapPercentageKeyframe as d, type GsapProvenance as e, type GsapProvenanceKind as f, type ParsedGsap as g, type PropertyGroupName as h, SUPPORTED_PROPS as i, type SourcedGsapPercentageKeyframe as j, type SplitAnimationsOptions as k, type SplitAnimationsResult as l, classifyPropertyGroup as m, classifyTweenPropertyGroup as n, editabilityForProvenance as o, getAnimationsForElementId as p, gsapAnimationsToKeyframes as q, keyframesToGsapAnimations as r, serializeGsapAnimations as s, buildArcPath as t, type GsapKeyframeFormat as u, validateCompositionGsap as v, isXYPositionWrite as w, positionHoldForAnimation as x };

package/dist/gsapWriterAcorn.d.ts

@@ -1,4 +1,4 @@
-import { G as GsapAnimation, A as ArcPathConfig, k as SplitAnimationsOptions, l as SplitAnimationsResult, a as ArcPathSegment } from './gsapSerialize-g8oprts9.js';
+import { G as GsapAnimation, A as ArcPathConfig, k as SplitAnimationsOptions, l as SplitAnimationsResult, a as ArcPathSegment } from './gsapSerialize-CVwsMItk.js';
 import './types-Ejqndkej.js';
 
 type TweenTarget = Pick<GsapAnimation, "targetSelector" | "hasPartialSelector">;
@@ -101,6 +101,23 @@ declare function materializeKeyframesFromScript(script: string, animationId: str
     properties: Record<string, number | string>;
     ease?: string;
 }>, easeEach?: string, resolvedSelector?: string): string;
+/**
+ * Rewrites a tween as `to()` with these keyframes where it stands: the call keeps its place in the
+ * script and its position argument, so a tween placed after it ('>', '<', '+=', none) stays put.
+ */
+declare function replaceTweenWithKeyframesInScript(script: string, animationId: string, edit: {
+    targetSelector: string;
+    position: number;
+    duration: number;
+    keyframes: Array<{
+        percentage: number;
+        properties: Record<string, number | string>;
+        ease?: string;
+        auto?: boolean;
+    }>;
+    ease?: string;
+    easeEach?: string;
+}): string | null;
 /** Insert a new keyframed `to()` call and return the new animation ID. */
 declare function addAnimationWithKeyframesToScript(script: string, targetSelector: string, position: number, duration: number, keyframes: Array<{
     percentage: number;
@@ -160,4 +177,4 @@ type UnrollElement = {
  */
 declare function unrollDynamicAnimations(script: string, animationId: string, elements: UnrollElement[]): string;
 
-export { type UnrollElement, addAnimationToScript, addAnimationWithKeyframesToScript, addKeyframeToScript, addLabelToScript, addMotionPathPointInScript, addMotionPathToScript, clipQueryRoot, clipTweenMatcher, convertToKeyframesFromScript, copyAnimationsInScript, dedupePositionWritesInScript, hasExplicitTime, materializeKeyframesFromScript, moveKeyframeInScript, removeAllKeyframesFromScript, removeAnimationFromScript, removeArcPathFromScript, removeKeyframeFromScript, removeLabelFromScript, removeMotionPathPointInScript, removePropertyFromAnimation, resizeKeyframedTweenInScript, scalePositionsInScript, setArcPathInScript, shiftPositionsInScript, splitAnimationsInScript, splitIntoPropertyGroupsFromScript, syncPositionHoldsBeforeKeyframes, unrollDynamicAnimations, updateAnimationInScript, updateArcSegmentInScript, updateKeyframeInScript, updateMotionPathPointInScript };
+export { type UnrollElement, addAnimationToScript, addAnimationWithKeyframesToScript, addKeyframeToScript, addLabelToScript, addMotionPathPointInScript, addMotionPathToScript, clipQueryRoot, clipTweenMatcher, convertToKeyframesFromScript, copyAnimationsInScript, dedupePositionWritesInScript, hasExplicitTime, materializeKeyframesFromScript, moveKeyframeInScript, removeAllKeyframesFromScript, removeAnimationFromScript, removeArcPathFromScript, removeKeyframeFromScript, removeLabelFromScript, removeMotionPathPointInScript, removePropertyFromAnimation, replaceTweenWithKeyframesInScript, resizeKeyframedTweenInScript, scalePositionsInScript, setArcPathInScript, shiftPositionsInScript, splitAnimationsInScript, splitIntoPropertyGroupsFromScript, syncPositionHoldsBeforeKeyframes, unrollDynamicAnimations, updateAnimationInScript, updateArcSegmentInScript, updateKeyframeInScript, updateMotionPathPointInScript };

package/dist/gsapWriterAcorn.js

@@ -14,9 +14,11 @@ var PROP_TO_GROUP = /* @__PURE__ */ new Map();
 for (const [group, props] of Object.entries(PROPERTY_GROUPS)) {
   for (const p of props) PROP_TO_GROUP.set(p, group);
 }
+function writesProperty(animation, property) {
+  return property in animation.properties || !!animation.fromProperties && property in animation.fromProperties || !!animation.keyframes?.keyframes.some((k) => property in k.properties);
+}
 function isXYPositionWrite(a) {
-  const xy = (props) => !!props && ("x" in props || "y" in props);
-  return a.propertyGroup === "position" && (xy(a.properties) || xy(a.fromProperties) || !!a.keyframes?.keyframes.some((k) => xy(k.properties)));
+  return a.propertyGroup === "position" && (writesProperty(a, "x") || writesProperty(a, "y"));
 }
 function classifyPropertyGroup(prop) {
   return PROP_TO_GROUP.get(prop) ?? "other";
@@ -31,6 +33,30 @@ function classifyTweenPropertyGroup(properties) {
   if (groups.size === 1) return groups.values().next().value;
   return void 0;
 }
+function knownStart(animation) {
+  if (animation.resolvedStart !== void 0) return animation.resolvedStart;
+  return typeof animation.position === "number" ? animation.position : void 0;
+}
+function positionHoldForAnimation(animation, animations) {
+  if (!animation.keyframes) return null;
+  const start = knownStart(animation) ?? 0;
+  if (!(start > 1e-3)) return null;
+  const first = [...animation.keyframes.keyframes].sort(
+    (left, right) => left.percentage - right.percentage
+  )[0];
+  if (!first) return null;
+  const earlier = animations.filter((other) => {
+    const otherStart = knownStart(other);
+    return other !== animation && !other.global && other.targetSelector === animation.targetSelector && otherStart !== void 0 && otherStart < start - 1e-3;
+  });
+  const position = {};
+  for (const [property, value] of Object.entries(first.properties)) {
+    if (classifyPropertyGroup(property) !== "position" || typeof value !== "number") continue;
+    if (earlier.some((other) => writesProperty(other, property))) continue;
+    position[property] = value;
+  }
+  return Object.keys(position).length > 0 ? position : null;
+}
 
 // src/gsapSerialize.ts
 function mergePercentageKeyframes(keyframes) {
@@ -1219,6 +1245,41 @@ function resolveTimelinePositions(anims, labelDefs = []) {
   });
   while (labelIdx < sortedLabels.length) defineLabel(sortedLabels[labelIdx++]);
 }
+function collectAddLabelDefs(ast, ref, scope, sortedCalls) {
+  const callKeys = sortedCalls.map((c) => ({
+    site: callSiteStart(c),
+    order: c.node.__hfOrder
+  }));
+  const comesAfter = (site, order, labelSite, labelOrder) => {
+    if (site === void 0) return false;
+    if (site !== labelSite) return site > labelSite;
+    return (order ?? -Infinity) > (labelOrder ?? -Infinity);
+  };
+  const defs = [];
+  acornWalk.simple(ast, {
+    // fallow-ignore-next-line complexity
+    CallExpression(node) {
+      const callee = node.callee;
+      const objMatches = ref.kind === "identifier" ? callee.object?.type === "Identifier" && callee.object.name === ref.name : sameMemberAccess(callee.object, ref.node);
+      if (callee?.type !== "MemberExpression" || !objMatches || callee.property?.name !== "addLabel")
+        return;
+      const nameNode = node.arguments?.[0];
+      const name = typeof nameNode?.value === "string" ? nameNode.value : void 0;
+      if (!name) return;
+      const posVal = resolveNode(node.arguments?.[1], scope);
+      const position = typeof posVal === "number" || typeof posVal === "string" ? posVal : void 0;
+      const labelStart = node.__hfSiteStart ?? callee.property?.start;
+      const labelOrder = node.__hfOrder;
+      let order = sortedCalls.length;
+      if (labelStart !== void 0) {
+        order = callKeys.findIndex((k) => comesAfter(k.site, k.order, labelStart, labelOrder));
+        if (order === -1) order = sortedCalls.length;
+      }
+      defs.push({ name, position, order });
+    }
+  });
+  return defs;
+}
 function compareByLoc(a, b) {
   const aLoc = a.node.callee?.property?.loc?.start;
   const bLoc = b.node.callee?.property?.loc?.start;
@@ -1271,7 +1332,7 @@ function parseGsapScriptAcornForWrite(script) {
       (call) => tweenCallToAnimation(call, scope, script, identifierBindings)
     );
     applyTimelineDefaults(rawAnims, detection.defaults);
-    resolveTimelinePositions(rawAnims);
+    resolveTimelinePositions(rawAnims, collectAddLabelDefs(ast, ref, scope, calls));
     const animations = assignStableIds(rawAnims);
     const located = calls.map((call, i) => ({
       id: animations[i].id,
@@ -1559,7 +1620,8 @@ function overwritePosition(ms, call, position) {
   if (call.positionArg) {
     ms.overwrite(call.positionArg.start, call.positionArg.end, valueToCode(position));
   } else {
-    ms.appendLeft(call.node.end - 1, `, ${valueToCode(position)}`);
+    const last = call.node.arguments.at(-1);
+    ms.appendLeft(last ? last.end : call.node.end - 1, `, ${valueToCode(position)}`);
   }
 }
 function shiftPositionsInScript(script, targetSelector, delta, root) {
@@ -2362,6 +2424,33 @@ function materializeKeyframesFromScript(script, animationId, keyframes, easeEach
   }
   return ms.toString();
 }
+function replaceTweenWithKeyframesInScript(script, animationId, edit) {
+  const parsed = parseGsapScriptAcornForWrite(script);
+  const target = parsed?.located.find((l) => l.id === animationId);
+  const call = target?.call;
+  if (!target || call?.varsArg?.type !== "ObjectExpression") return null;
+  const { animation } = target;
+  if (animation.method !== "to" && animation.method !== "from" && animation.method !== "fromTo")
+    return null;
+  const ms = new MagicString(script);
+  const start = animation.resolvedStart ?? animation.position;
+  const moved = typeof start !== "number" || Math.abs(start - edit.position) > 5e-4;
+  const kept = preservedVarsEntries(call.varsArg, script).filter(
+    (e) => !/^\s*duration\s*:/.test(e) && !(moved && /^\s*delay\s*:/.test(e))
+  );
+  const sorted = [...edit.keyframes].sort((a, b) => a.percentage - b.percentage);
+  const parts = [`keyframes: ${buildKeyframeObjectCode(sorted, edit.easeEach)}`, ...kept];
+  parts.push(`duration: ${valueToCode(edit.duration)}`);
+  if (edit.ease) parts.push(`ease: ${JSON.stringify(edit.ease)}`);
+  if (animation.hasUnresolvedSelector || animation.targetSelector !== edit.targetSelector) {
+    const selectorArg = call.node.arguments[0];
+    ms.overwrite(selectorArg.start, selectorArg.end, JSON.stringify(edit.targetSelector));
+  }
+  convertMethodToTo(ms, animation, call, call.varsArg);
+  overwriteVarsArg(ms, call, `{ ${parts.join(", ")} }`);
+  if (moved) overwritePosition(ms, call, edit.position);
+  return ms.toString();
+}
 function addAnimationWithKeyframesToScript(script, targetSelector, position, duration, keyframes, ease, easeEach) {
   const parsed = parseGsapScriptAcornForWrite(script);
   if (!parsed) return { script, id: "" };
@@ -2746,7 +2835,8 @@ function insertInheritedStateSetInScript(script, selector, position, properties)
   const tlDecl = findTimelineDeclarationStatement(parsed.ast, parsed.timelineVar);
   const firstLocated = parsed.located[0];
   if (tlDecl) {
-    ms.appendLeft(tlDecl.end, "\n" + code);
+    const ownLineEnd = script[tlDecl.end] === "\n" ? "" : "\n";
+    ms.appendLeft(tlDecl.end, "\n" + code + ownLineEnd);
   } else if (firstLocated) {
     const firstCall = firstLocated.call;
     const exprStmt = findEnclosingExpressionStatement(firstCall.ancestors);
@@ -2768,38 +2858,15 @@ function removeStudioHoldSets(script, parsed) {
   for (const hold of staleHolds) removeCallFromMagicString(ms, hold.call, script);
   return ms.toString();
 }
-function animationStart(animation) {
-  if (animation.resolvedStart !== void 0) return animation.resolvedStart;
-  return typeof animation.position === "number" ? animation.position : 0;
-}
-function positionProperties(properties) {
-  const position = {};
-  for (const [property, value] of Object.entries(properties)) {
-    if (classifyPropertyGroup(property) === "position" && typeof value === "number") {
-      position[property] = value;
-    }
-  }
-  return position;
-}
-function positionHoldForAnimation(animation) {
-  if (!animation.keyframes) return null;
-  if (!(animationStart(animation) > 1e-3)) return null;
-  const first = [...animation.keyframes.keyframes].sort(
-    (left, right) => left.percentage - right.percentage
-  )[0];
-  if (!first) return null;
-  const position = positionProperties(first.properties);
-  return Object.keys(position).length > 0 ? position : null;
-}
 function syncPositionHoldsBeforeKeyframes(script) {
   const parsed = parseGsapScriptAcornForWrite(script);
   if (!parsed) return script;
   let result = removeStudioHoldSets(script, parsed);
   const current = parseGsapScriptAcornForWrite(result);
   if (!current) return result;
-  for (const entry of current.located) {
-    const animation = entry.animation;
-    const position = positionHoldForAnimation(animation);
+  const animations = current.located.map((entry) => entry.animation);
+  for (const animation of animations) {
+    const position = positionHoldForAnimation(animation, animations);
     if (!position) continue;
     result = insertInheritedStateSetInScript(result, animation.targetSelector, 0, {
       ...position,
@@ -3115,6 +3182,7 @@ export {
   removeLabelFromScript,
   removeMotionPathPointInScript,
   removePropertyFromAnimation,
+  replaceTweenWithKeyframesInScript,
   resizeKeyframedTweenInScript,
   scalePositionsInScript,
   setArcPathInScript,