@hyperframes/parsers 0.7.18 → 0.7.19

package/dist/gsapWriterAcorn.d.ts

@@ -24,9 +24,49 @@ declare function addAnimationToScript(script: string, animation: Omit<GsapAnimat
     id: string;
 };
 declare function removeAnimationFromScript(script: string, animationId: string): string;
+/**
+ * Enforce "exactly one position write per element". Position commits (drag, add
+ * keyframe, static hold) must never leave the same selector with two conflicting
+ * position representations (e.g. a degenerate `tl.to("#box",{duration:0,x,y})`
+ * AND a `gsap.set("#box",{x,y})`) — the later one silently overrides the earlier,
+ * so the element "can't move" / snaps / leaves residue on delete.
+ *
+ * Keeps `keepId` (the write the commit just edited); falls back to the LAST
+ * position write in source order (the runtime-effective one) if `keepId` is stale.
+ * Removes every OTHER pure-position write (`propertyGroup === "position"`, which
+ * covers tl.to/from/fromTo flat-or-keyframed, tl.set, and standalone gsap.set,
+ * including degenerate duration:0 tweens). Non-position writes for the same
+ * selector (rotation / opacity / size / mixed) are left untouched.
+ */
+declare function dedupePositionWritesInScript(script: string, selector: string, keepId?: string): string;
 declare function updateKeyframeInScript(script: string, animationId: string, percentage: number, properties: Record<string, number | string>, ease?: string): string;
 declare function addKeyframeToScript(script: string, animationId: string, percentage: number, properties: Record<string, number | string>, ease?: string, backfillDefaults?: Record<string, number | string>): string;
 declare function removeKeyframeFromScript(script: string, animationId: string, percentage: number): string;
+/**
+ * Retime a keyframe: move the keyframe at `fromPercentage` to `toPercentage`,
+ * PRESERVING its properties and per-keyframe ease (the Studio "Move to Playhead"
+ * gesture). Re-sorts keyframes by percentage. If a keyframe already exists at
+ * `toPercentage`, it is overwritten by the moved one (no duplicate). No-op when
+ * the animation/keyframe isn't found, the tween has no object-form keyframes, or
+ * the move resolves onto the same keyframe.
+ */
+declare function moveKeyframeInScript(script: string, animationId: string, fromPercentage: number, toPercentage: number): string;
+/**
+ * Resize a keyframed tween's window (boundary drag-to-retime): set the tween's
+ * `position` (trailing position arg) + `duration`, and RE-KEY each existing
+ * keyframe to its new percentage via `pctRemap` (each `{ from, to }` matches an
+ * existing keyframe by its current tween-% and re-keys it to `to`).
+ *
+ * Unlike replace-with-keyframes (which rebuilds the keyframes object from a plain
+ * array and loses author intent), this re-keys the percentage KEY in place and
+ * leaves every value node, each keyframe's `_auto` + per-keyframe `ease`, the
+ * keyframes-object `easeEach`, and the OUTER tween `ease` byte-for-byte verbatim.
+ * No-op when the animation/keyframes can't be located.
+ */
+declare function resizeKeyframedTweenInScript(script: string, animationId: string, newPosition: number, newDuration: number, pctRemap: ReadonlyArray<{
+    from: number;
+    to: number;
+}>): string;
 declare function removePropertyFromAnimation(script: string, animationId: string, property: string, from?: boolean): string;
 /**
  * Remove all keyframes from a tween, collapsing to a flat tween with one
@@ -91,4 +131,4 @@ type UnrollElement = {
  */
 declare function unrollDynamicAnimations(script: string, animationId: string, elements: UnrollElement[]): string;
 
-export { type UnrollElement, addAnimationToScript, addAnimationWithKeyframesToScript, addKeyframeToScript, addLabelToScript, convertToKeyframesFromScript, materializeKeyframesFromScript, removeAllKeyframesFromScript, removeAnimationFromScript, removeArcPathFromScript, removeKeyframeFromScript, removeLabelFromScript, removePropertyFromAnimation, scalePositionsInScript, setArcPathInScript, shiftPositionsInScript, splitAnimationsInScript, splitIntoPropertyGroupsFromScript, unrollDynamicAnimations, updateAnimationInScript, updateArcSegmentInScript, updateKeyframeInScript };
+export { type UnrollElement, addAnimationToScript, addAnimationWithKeyframesToScript, addKeyframeToScript, addLabelToScript, convertToKeyframesFromScript, dedupePositionWritesInScript, materializeKeyframesFromScript, moveKeyframeInScript, removeAllKeyframesFromScript, removeAnimationFromScript, removeArcPathFromScript, removeKeyframeFromScript, removeLabelFromScript, removePropertyFromAnimation, resizeKeyframedTweenInScript, scalePositionsInScript, setArcPathInScript, shiftPositionsInScript, splitAnimationsInScript, splitIntoPropertyGroupsFromScript, unrollDynamicAnimations, updateAnimationInScript, updateArcSegmentInScript, updateKeyframeInScript };

package/dist/gsapWriterAcorn.js

@@ -1223,19 +1223,37 @@ function addAnimationToScript(script, animation) {
   const newId = reParsed?.located[reParsed.located.length - 1]?.id ?? "";
   return { script: result, id: newId };
 }
+function removeCallFromMagicString(ms, call, script) {
+  const N = call.node;
+  const exprStmt = findEnclosingExpressionStatement(call.ancestors);
+  if (N.callee?.object?.type !== "CallExpression" && exprStmt?.expression === N) {
+    const end = exprStmt.end < script.length && script[exprStmt.end] === "\n" ? exprStmt.end + 1 : exprStmt.end;
+    ms.remove(exprStmt.start, end);
+  } else {
+    ms.remove(N.callee.object.end, N.end);
+  }
+}
 function removeAnimationFromScript(script, animationId) {
   const parsed = parseGsapScriptAcornForWrite(script);
   if (!parsed) return script;
   const target = parsed.located.find((l) => l.id === animationId);
   if (!target) return script;
   const ms = new MagicString(script);
-  const N = target.call.node;
-  const exprStmt = findEnclosingExpressionStatement(target.call.ancestors);
-  if (N.callee?.object?.type !== "CallExpression" && exprStmt?.expression === N) {
-    const end = exprStmt.end < script.length && script[exprStmt.end] === "\n" ? exprStmt.end + 1 : exprStmt.end;
-    ms.remove(exprStmt.start, end);
-  } else {
-    ms.remove(N.callee.object.end, N.end);
+  removeCallFromMagicString(ms, target.call, script);
+  return ms.toString();
+}
+function dedupePositionWritesInScript(script, selector, keepId) {
+  const parsed = parseGsapScriptAcornForWrite(script);
+  if (!parsed) return script;
+  const posWrites = parsed.located.filter(
+    (l) => l.animation.targetSelector === selector && l.animation.propertyGroup === "position"
+  );
+  if (posWrites.length <= 1) return script;
+  const keeper = posWrites.find((l) => l.id === keepId) ?? posWrites[posWrites.length - 1];
+  const ms = new MagicString(script);
+  for (const l of posWrites) {
+    if (l === keeper) continue;
+    removeCallFromMagicString(ms, l.call, script);
   }
   return ms.toString();
 }
@@ -1322,6 +1340,7 @@ function convertFlatTweenToKeyframes(script, target) {
 }
 var PERCENTAGE_KEY_RE2 = /^(\d+(?:\.\d+)?)%$/;
 var PCT_TOLERANCE = 2;
+var MOVE_NOOP_EPSILON_PCT = 0.05;
 function percentageFromKey(key) {
   const m = PERCENTAGE_KEY_RE2.exec(key);
   return m ? Number.parseFloat(m[1] ?? "0") : Number.NaN;
@@ -1631,6 +1650,50 @@ function removeKeyframeFromScript(script, animationId, percentage) {
   removeProp(ms, match.prop, allProps);
   return ms.toString();
 }
+function moveKeyframeInScript(script, animationId, fromPercentage, toPercentage) {
+  const located = locateWithKeyframes(script, animationId);
+  if (!located) return script;
+  const { kfNode } = located;
+  const match = findKfPropByPct(kfNode, fromPercentage);
+  if (!match) return script;
+  if (Math.abs(fromPercentage - toPercentage) < MOVE_NOOP_EPSILON_PCT) return script;
+  const dest = findKfPropByPct(kfNode, toPercentage);
+  const collision = dest && dest.prop !== match.prop ? dest : null;
+  const entries = [];
+  for (const prop of percentagePropsOf(kfNode)) {
+    if (prop === match.prop) continue;
+    if (collision && prop === collision.prop) continue;
+    const pct = percentageFromKey(propKeyName2(prop) ?? "");
+    if (Number.isNaN(pct)) continue;
+    entries.push({ pct, record: valueNodeToRecord(prop.value, script) });
+  }
+  entries.push({ pct: toPercentage, record: valueNodeToRecord(match.prop.value, script) });
+  entries.sort((a, b) => a.pct - b.pct);
+  const body = entries.map((e) => `${JSON.stringify(`${e.pct}%`)}: ${recordToCode(e.record)}`).join(", ");
+  const ms = new MagicString(script);
+  ms.overwrite(kfNode.start, kfNode.end, `{ ${body} }`);
+  return ms.toString();
+}
+function resizeKeyframedTweenInScript(script, animationId, newPosition, newDuration, pctRemap) {
+  const located = locateWithKeyframes(script, animationId);
+  if (!located) return script;
+  const { target, kfNode } = located;
+  const edits = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const { from, to } of pctRemap) {
+    const match = findKfPropByPct(kfNode, from);
+    if (!match || seen.has(match.prop.key)) continue;
+    seen.add(match.prop.key);
+    edits.push({ keyNode: match.prop.key, to });
+  }
+  const ms = new MagicString(script);
+  for (const { keyNode, to } of edits) {
+    ms.overwrite(keyNode.start, keyNode.end, JSON.stringify(`${to}%`));
+  }
+  overwritePosition(ms, target.call, newPosition);
+  upsertProp(ms, target.call.varsArg, "duration", newDuration);
+  return ms.toString();
+}
 function removePropertyFromAnimation(script, animationId, property, from = false) {
   const parsed = parseGsapScriptAcornForWrite(script);
   if (!parsed) return script;
@@ -1662,6 +1725,14 @@ function removeAllKeyframesFromScript(script, animationId) {
     target.call,
     buildVarsObjectCode(buildCollapsedFlatVars(target.animation, collapse))
   );
+  if (target.animation.propertyGroup === "position") {
+    for (const l of parsed.located) {
+      if (l === target) continue;
+      if (l.animation.targetSelector === target.animation.targetSelector && l.animation.propertyGroup === "position") {
+        removeCallFromMagicString(ms, l.call, script);
+      }
+    }
+  }
   return ms.toString();
 }
 function buildCollapsedFlatVars(animation, collapse) {
@@ -1669,11 +1740,11 @@ function buildCollapsedFlatVars(animation, collapse) {
   for (const [k, v] of Object.entries(collapse.properties)) {
     if (k !== "ease") flat[k] = v;
   }
-  if (animation.duration !== void 0) flat.duration = animation.duration;
-  if (animation.ease) flat.ease = animation.ease;
   for (const [k, v] of Object.entries(animation.extras ?? {})) {
     if (typeof v === "number" || typeof v === "string") flat[k] = v;
   }
+  flat.duration = 0;
+  flat.immediateRender = true;
   return flat;
 }
 function buildKeyframesVarsCode(animation, fromProps, toProps, varsNode, source, setDuration) {
@@ -2393,13 +2464,16 @@ export {
   addKeyframeToScript,
   addLabelToScript,
   convertToKeyframesFromScript,
+  dedupePositionWritesInScript,
   materializeKeyframesFromScript,
+  moveKeyframeInScript,
   removeAllKeyframesFromScript,
   removeAnimationFromScript,
   removeArcPathFromScript,
   removeKeyframeFromScript,
   removeLabelFromScript,
   removePropertyFromAnimation,
+  resizeKeyframedTweenInScript,
   scalePositionsInScript,
   setArcPathInScript,
   shiftPositionsInScript,