@hyperframes/parsers 0.7.58 → 0.7.59

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { C as CompositionVariable, T as TimelineElement, a as CanvasResolution, K as Keyframe, S as StageZoomKeyframe, V as ValidationResult } from './types-CaeOJXdW.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, 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 isCompositionElement, y as isMediaElement, z as isTextElement, G as normalizeResolutionFlag } from './types-CaeOJXdW.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 ParsedGsap, S as SplitAnimationsOptions, g as SplitAnimationsResult, h as editabilityForProvenance, i as getAnimationsForElementId, j as gsapAnimationsToKeyframes, k as keyframesToGsapAnimations, s as serializeGsapAnimations, v as validateCompositionGsap } from './gsapSerialize-B8jHFdp3.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 ParsedGsap, S as SplitAnimationsOptions, g as SplitAnimationsResult, h as editabilityForProvenance, i as getAnimationsForElementId, j as gsapAnimationsToKeyframes, k as keyframesToGsapAnimations, s as serializeGsapAnimations, v as validateCompositionGsap } from './gsapSerialize-CTPaxKTV.js';
 export { isStudioHoldSet } from './gsapParser.js';
 export { PROPERTY_GROUPS, PropertyGroupName, SUPPORTED_EASES, SUPPORTED_PROPS, classifyPropertyGroup, classifyTweenPropertyGroup } from './gsapConstants.js';
 export { SPRING_PRESETS, SpringPreset, generateSpringEaseData } from './springEase.js';

package/dist/index.js

@@ -480,13 +480,18 @@ function collectPatternNames(pattern, out) {
   else if (pattern?.type === "AssignmentPattern") collectPatternNames(pattern.left, out);
   else if (pattern?.type === "RestElement") collectPatternNames(pattern.argument, out);
 }
+function boundPatterns(node) {
+  if (isFunctionNode(node)) return node.params ?? [];
+  if (node.type === "VariableDeclarator") return [node.id];
+  if (node.type === "CatchClause") return [node.param];
+  if (node.type === "AssignmentExpression" && node.left?.type === "Identifier") return [node.left];
+  return [];
+}
 function collectBoundNames(root) {
   const names = /* @__PURE__ */ new Set();
   const visit = (node) => {
     if (!isNode(node)) return node;
-    if (isFunctionNode(node)) for (const p of node.params ?? []) collectPatternNames(p, names);
-    else if (node.type === "VariableDeclarator") collectPatternNames(node.id, names);
-    else if (node.type === "CatchClause") collectPatternNames(node.param, names);
+    for (const pattern of boundPatterns(node)) collectPatternNames(pattern, names);
     transformChildren(node, visit);
     return node;
   };
@@ -654,8 +659,10 @@ function tagTimelineCalls(stmts, prov, ctx) {
 }
 function expandBody(bodyStmts, bindings, prov, ctx) {
   const block = substituteParams(cloneNode({ type: "BlockStatement", body: bodyStmts }), bindings);
+  tagProvenance(block, prov);
   tagTimelineCalls(block.body, prov, ctx);
-  return expandStatements(block.body, { ...ctx, depth: ctx.depth + 1 });
+  block.body = expandStatements(block.body, { ...ctx, depth: ctx.depth + 1 });
+  return [block];
 }
 function inlineHelper(call, ctx) {
   const fn = ctx.helpers.get(call.callee.name);
@@ -846,6 +853,7 @@ var QUERY_METHODS = /* @__PURE__ */ new Set(["querySelector", "querySelectorAll"
 var ITERATION_METHODS = /* @__PURE__ */ new Set(["forEach", "map"]);
 var SCOPE_NODE_TYPES = /* @__PURE__ */ new Set([
   "Program",
+  "BlockStatement",
   "FunctionDeclaration",
   "FunctionExpression",
   "ArrowFunctionExpression"
@@ -954,10 +962,12 @@ function selectorFromQueryCall(node, scope) {
   if (method === "getElementById") return `#${argValue}`;
   return null;
 }
-function enclosingScopeNodeFromAncestors(ancestors) {
+function enclosingScopeNodeFromAncestors(ancestors, includeBlocks = true) {
   for (let i = ancestors.length - 2; i >= 0; i--) {
     const node = ancestors[i];
-    if (node && SCOPE_NODE_TYPES.has(node.type)) return node;
+    if (node && SCOPE_NODE_TYPES.has(node.type) && (includeBlocks || node.type !== "BlockStatement")) {
+      return node;
+    }
   }
   return null;
 }
@@ -969,6 +979,64 @@ function scopeChainFromAncestors(ancestors) {
   }
   return chain;
 }
+function nearestExpandedScopeFromAncestors(ancestors) {
+  for (let index = ancestors.length - 2; index >= 0; index--) {
+    const candidate = ancestors[index];
+    if (candidate?.type === "BlockStatement" && readProvenance(candidate)) return candidate;
+  }
+  return void 0;
+}
+function findVisibleIdentifierDeclaration(name, ancestors, index, usageStart = Number.POSITIVE_INFINITY) {
+  const declarations = index.declarationsByName.get(name) ?? [];
+  const expandedScopeNode = nearestExpandedScopeFromAncestors(ancestors);
+  for (const scopeNode of scopeChainFromAncestors(ancestors)) {
+    const candidates = declarations.filter(
+      (declaration) => declaration.scopeNode === scopeNode && (!declaration.expandedScopeNode || declaration.expandedScopeNode === expandedScopeNode) && (declaration.kind === "var" || declaration.kind === "param" || declaration.node.start < usageStart)
+    ).sort((left, right) => right.node.start - left.node.start);
+    if (candidates[0]) return candidates[0];
+  }
+  return void 0;
+}
+function collectIdentifierBindingIndex(ast) {
+  const declarationsByName = /* @__PURE__ */ new Map();
+  const reassignedDeclarations = /* @__PURE__ */ new Set();
+  acornWalk.ancestor(ast, {
+    VariableDeclarator(node, _, ancestors) {
+      const name = node.id?.name;
+      if (!name) return;
+      const declaration = ancestors.at(-2);
+      const kind = declaration?.kind;
+      if (!kind) return;
+      const includeBlocks = declaration?.type !== "VariableDeclaration" || kind !== "var";
+      const scopeNode = enclosingScopeNodeFromAncestors(ancestors, includeBlocks);
+      const expandedScopeNode = nearestExpandedScopeFromAncestors(ancestors);
+      const entries = declarationsByName.get(name) ?? [];
+      entries.push({ node, scopeNode, expandedScopeNode, name, kind });
+      declarationsByName.set(name, entries);
+    },
+    FunctionDeclaration: indexFunctionParameters,
+    FunctionExpression: indexFunctionParameters,
+    ArrowFunctionExpression: indexFunctionParameters
+  });
+  const index = { declarationsByName, reassignedDeclarations };
+  acornWalk.ancestor(ast, {
+    AssignmentExpression(node, _, ancestors) {
+      const name = node.left?.type === "Identifier" ? node.left.name : void 0;
+      if (!name) return;
+      const declaration = findVisibleIdentifierDeclaration(name, ancestors, index, node.start);
+      if (declaration) reassignedDeclarations.add(declaration.node);
+    }
+  });
+  return index;
+  function indexFunctionParameters(node) {
+    for (const parameter of node.params ?? []) {
+      if (parameter?.type !== "Identifier") continue;
+      const entries = declarationsByName.get(parameter.name) ?? [];
+      entries.push({ node: parameter, scopeNode: node, name: parameter.name, kind: "param" });
+      declarationsByName.set(parameter.name, entries);
+    }
+  }
+}
 function addBinding(bindings, scopeNode, name, selector) {
   let scoped = bindings.get(scopeNode);
   if (!scoped) {
@@ -1020,21 +1088,39 @@ function collectScopeBindings(ast) {
   });
   return bindings;
 }
-function collectTargetBindings(ast, scope) {
+function collectTargetBindings(ast, scope, identifierBindings) {
   const bindings = /* @__PURE__ */ new Map();
   acornWalk.ancestor(ast, {
     VariableDeclarator(node, _, ancestors) {
       const name = node.id?.name;
       const selector = selectorFromQueryCall(node.init, scope);
       if (name && selector !== null) {
-        addBinding(bindings, enclosingScopeNodeFromAncestors(ancestors), name, selector);
+        const declaration = ancestors.at(-2);
+        const includeBlocks = declaration?.type !== "VariableDeclaration" || declaration.kind !== "var";
+        addBinding(
+          bindings,
+          enclosingScopeNodeFromAncestors(ancestors, includeBlocks),
+          name,
+          selector
+        );
       }
     },
     AssignmentExpression(node, _, ancestors) {
       const left = node.left;
       const selector = selectorFromQueryCall(node.right, scope);
       if (left?.type === "Identifier" && selector !== null) {
-        addBinding(bindings, enclosingScopeNodeFromAncestors(ancestors), left.name, selector);
+        const declaration = findVisibleIdentifierDeclaration(
+          left.name,
+          ancestors,
+          identifierBindings,
+          node.start
+        );
+        addBinding(
+          bindings,
+          declaration?.scopeNode ?? nearestExpandedScopeFromAncestors(ancestors) ?? enclosingScopeNodeFromAncestors(ancestors),
+          left.name,
+          selector
+        );
       }
     }
   });
@@ -1514,7 +1600,8 @@ function parseMotionPathNode(node, scope, source) {
   }
   return buildArcPath(coords, curviness, autoRotate, isCubic);
 }
-function tweenCallToAnimation(call, scope, source) {
+function tweenCallToAnimation(call, scope, source, identifierBindings) {
+  const provenance = readProvenance(call.node);
   const vars = objectExpressionToRecord(call.varsArg, scope, source);
   const properties = {};
   const extras = {};
@@ -1593,9 +1680,26 @@ function tweenCallToAnimation(call, scope, source) {
     duration = computeKeyframesTotalDuration(call.varsArg, scope, source);
   }
   let selector = call.selector;
+  let targetIdentity;
   if (selector === "__unresolved__") {
-    const proxyLabel = describeProxyTarget(call.node.arguments?.[0], call.varsArg, scope);
-    if (proxyLabel) selector = proxyLabel;
+    const targetNode = call.node.arguments?.[0];
+    const proxyLabel = describeProxyTarget(targetNode, call.varsArg, scope);
+    if (proxyLabel) {
+      selector = proxyLabel;
+      if (targetNode?.type === "Identifier") {
+        const declaration = findVisibleIdentifierDeclaration(
+          targetNode.name,
+          call.ancestors,
+          identifierBindings,
+          call.node.start
+        );
+        if (declaration?.node.init?.type === "ObjectExpression" && !identifierBindings.reassignedDeclarations.has(declaration.node)) {
+          const declarationProvenance = readProvenance(declaration.scopeNode) ?? readProvenance(declaration.expandedScopeNode);
+          const instanceIdentity = declarationProvenance && (declarationProvenance.kind === "helper" || declarationProvenance.kind === "loop") ? `:${declarationProvenance.kind}:${declarationProvenance.callSite ?? ""}:${declarationProvenance.iteration ?? ""}` : "";
+          targetIdentity = `proxy:${targetNode.name}@${declaration.node.start}${instanceIdentity}`;
+        }
+      }
+    }
   }
   const anim = {
     targetSelector: selector,
@@ -1606,6 +1710,7 @@ function tweenCallToAnimation(call, scope, source) {
     duration,
     ease
   };
+  if (targetIdentity) anim.targetIdentity = targetIdentity;
   if (!hasPositionArg) anim.implicitPosition = true;
   let group = classifyTweenPropertyGroup(properties);
   if (!group && keyframesData) {
@@ -1622,7 +1727,6 @@ function tweenCallToAnimation(call, scope, source) {
   if (motionPathResult) anim.arcPath = motionPathResult.arcPath;
   if (hasUnresolvedKeyframes) anim.hasUnresolvedKeyframes = true;
   if (selector === "__unresolved__") anim.hasUnresolvedSelector = true;
-  const provenance = readProvenance(call.node);
   if (provenance) anim.provenance = provenance;
   return anim;
 }
@@ -1874,13 +1978,16 @@ function parseGsapScriptAcornForWrite(script) {
       locations: true
     });
     const scope = collectScopeBindings(ast);
-    const targetBindings = collectTargetBindings(ast, scope);
+    const identifierBindings = collectIdentifierBindingIndex(ast);
+    const targetBindings = collectTargetBindings(ast, scope, identifierBindings);
     const detection = findTimelineVar(ast, scope);
     const ref = detection.ref ?? { kind: "identifier", name: "tl" };
     const timelineVar = timelineRootSource(ref, script);
     const calls = findAllTweenCalls(ast, ref, scope, targetBindings);
     sortBySourcePosition(calls);
-    const rawAnims = calls.map((call) => tweenCallToAnimation(call, scope, script));
+    const rawAnims = calls.map(
+      (call) => tweenCallToAnimation(call, scope, script, identifierBindings)
+    );
     applyTimelineDefaults(rawAnims, detection.defaults);
     resolveTimelinePositions(rawAnims);
     const animations = assignStableIds(rawAnims);
@@ -1911,10 +2018,13 @@ function parseGsapScriptAcorn(script) {
       } catch {
       }
     }
-    const targetBindings = collectTargetBindings(ast, scope);
+    const identifierBindings = collectIdentifierBindingIndex(ast);
+    const targetBindings = collectTargetBindings(ast, scope, identifierBindings);
     const calls = findAllTweenCalls(ast, ref, scope, targetBindings);
     sortBySourcePosition(calls);
-    const rawAnims = calls.map((call) => tweenCallToAnimation(call, scope, script));
+    const rawAnims = calls.map(
+      (call) => tweenCallToAnimation(call, scope, script, identifierBindings)
+    );
     applyTimelineDefaults(rawAnims, detection.defaults);
     seedSetStates(rawAnims, collectGsapSetStates(ast, scope, targetBindings, script));
     const labelDefs = collectAddLabelDefs(ast, ref, scope, calls);