@hyperframes/parsers 0.8.49 → 0.8.51

package/dist/gsapParserAcorn.d.ts

@@ -1,5 +1,5 @@
-import { P as ParsedGsap, c as GsapMethod, G as GsapAnimation } from './gsapSerialize-QZcXUoVf.js';
-export { A as ArcPathConfig, a as ArcPathSegment, e as GsapProvenance, f as GsapProvenanceKind, K as KeyframeEditability, M as MotionPathShape, m as buildArcPath, i as editabilityForProvenance } from './gsapSerialize-QZcXUoVf.js';
+import { P as ParsedGsap, c as GsapMethod, G as GsapAnimation } from './gsapSerialize-b8lNzSbI.js';
+export { A as ArcPathConfig, a as ArcPathSegment, e as GsapProvenance, f as GsapProvenanceKind, K as KeyframeEditability, M as MotionPathShape, m as buildArcPath, i as editabilityForProvenance } from './gsapSerialize-b8lNzSbI.js';
 import './types-Y0NXTiVo.js';
 import './gsapConstants.js';
 

package/dist/gsapParserAcorn.js

@@ -58,7 +58,16 @@ function buildArcPath(coords, curviness, autoRotate, isCubic) {
 }
 
 // src/gsapInline.ts
-var SKIP_KEYS = /* @__PURE__ */ new Set(["type", "start", "end", "loc", "range", "__hfProvenance", "__hfOrder"]);
+var SKIP_KEYS = /* @__PURE__ */ new Set([
+  "type",
+  "start",
+  "end",
+  "loc",
+  "range",
+  "__hfProvenance",
+  "__hfOrder",
+  "__hfSiteStart"
+]);
 var FUNCTION_TYPES = /* @__PURE__ */ new Set([
   "ArrowFunctionExpression",
   "FunctionExpression",
@@ -161,6 +170,9 @@ function isTimelineRooted(call, timelineVar) {
   if (timelineRootName(call) !== timelineVar) return false;
   return call.callee?.property?.type === "Identifier" && GSAP_METHODS.has(call.callee.property.name);
 }
+function isAddLabelCall(call, timelineVar) {
+  return timelineRootName(call) === timelineVar && call.callee?.property?.name === "addLabel";
+}
 function containsTimelineCall(node, timelineVar) {
   let found = false;
   walkNodes(node, (n) => {
@@ -367,12 +379,17 @@ function bodyStatements(node) {
 }
 function tagTimelineCalls(stmts, prov, ctx) {
   for (const stmt of stmts) {
+    const calls = [];
     walkNodes(stmt, (n) => {
-      if (n.type === "CallExpression" && isTimelineRooted(n, ctx.timelineVar)) {
-        tagProvenance(n, { ...prov });
-        n.__hfOrder = ctx.order.n++;
-      }
+      if (n.type === "CallExpression" && (isTimelineRooted(n, ctx.timelineVar) || isAddLabelCall(n, ctx.timelineVar)))
+        calls.push(n);
     });
+    calls.sort((a, b) => a.callee.property.start - b.callee.property.start);
+    for (const n of calls) {
+      tagProvenance(n, { ...prov });
+      n.__hfOrder = ctx.order.n++;
+      n.__hfSiteStart = ctx.rootStart;
+    }
   }
 }
 function expandBody(bodyStmts, bindings, prov, ctx) {
@@ -559,10 +576,14 @@ function inlineComputedTimelines(ast, timelineVar, resolve) {
     resolve,
     depth: 0,
     site: { n: 0 },
-    order: { n: 0 }
+    order: { n: 0 },
+    rootStart: 0
   };
   const body = (ast.body ?? []).filter((stmt) => !isHelperDecl(stmt, helpers));
-  ast.body = expandStatements(body, ctx);
+  ast.body = body.flatMap((stmt) => {
+    ctx.rootStart = stmt.start;
+    return expandStatements([stmt], ctx);
+  });
 }
 
 // src/gsapObjectArrayTiming.ts
@@ -1008,6 +1029,14 @@ function objectExpressionToRecord(node, scope, source) {
 function isGsapTimelineCall(node) {
   return node?.type === "CallExpression" && node.callee?.type === "MemberExpression" && node.callee.object?.name === "gsap" && node.callee.property?.name === "timeline";
 }
+function hasUnknownDuration(varsNode, scope) {
+  if (!varsNode) return false;
+  if (varsNode.type !== "ObjectExpression") return true;
+  const props = varsNode.properties ?? [];
+  if (props.some((p) => p.type === "SpreadElement")) return true;
+  const prop = props.find((p) => isObjectProperty(p) && propKeyName(p) === "duration");
+  return prop !== void 0 && typeof resolveNode(prop.value, scope) !== "number";
+}
 function staticMemberKey(node) {
   if (!node || node.type !== "MemberExpression") return null;
   if (node.computed) {
@@ -1049,7 +1078,10 @@ function extractTimelineDefaults(callNode, scope) {
     const key = propKeyName(prop);
     const val = resolveNode(prop.value, scope);
     if (key === "ease" && typeof val === "string") result.ease = val;
-    if (key === "duration" && typeof val === "number") result.duration = val;
+    if (key === "duration") {
+      if (typeof val === "number") result.duration = val;
+      else result.durationUnresolved = true;
+    }
   }
   return Object.keys(result).length > 0 ? result : void 0;
 }
@@ -1424,6 +1456,7 @@ function tweenCallToAnimation(call, scope, source, identifierBindings) {
   if (duration === void 0 && keyframesData) {
     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__") {
@@ -1471,6 +1504,7 @@ function tweenCallToAnimation(call, scope, source, identifierBindings) {
   if (keyframesData) anim.keyframes = keyframesData;
   if (motionPathResult) anim.arcPath = motionPathResult.arcPath;
   if (hasUnresolvedKeyframes) anim.hasUnresolvedKeyframes = true;
+  if (durationUnresolved) anim.durationUnresolved = true;
   if (selector === "__unresolved__") anim.hasUnresolvedSelector = true;
   if (provenance) anim.provenance = provenance;
   return anim;
@@ -1594,8 +1628,9 @@ function applyTimelineDefaults(anims, defaults) {
   if (!defaults) return;
   for (const anim of anims) {
     if (anim.method === "set") continue;
-    if (anim.duration === void 0 && defaults.duration !== void 0) {
-      anim.duration = defaults.duration;
+    if (anim.duration === void 0 && !anim.durationUnresolved) {
+      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.ease = defaults.ease;
@@ -1628,12 +1663,14 @@ function resolveAnimStart(anim, cursor, prevStart, labels) {
 function resolveTimelinePositions(anims, labelDefs = []) {
   let cursor = 0;
   let prevStart = 0;
+  let cursorKnown = true;
   const labels = /* @__PURE__ */ new Map();
   let labelIdx = 0;
   const sortedLabels = [...labelDefs].sort((a, b) => a.order - b.order);
   const defineLabel = (def) => {
     let value;
     if (typeof def.position === "number") value = def.position;
+    else if (!cursorKnown) return;
     else if (typeof def.position === "string") {
       value = resolveLabelPosition(def.position, labels, cursor) ?? cursor;
     } else value = cursor;
@@ -1649,7 +1686,9 @@ function resolveTimelinePositions(anims, labelDefs = []) {
       return;
     }
     const duration = anim.method === "set" ? 0 : anim.duration ?? GSAP_DEFAULT_DURATION;
-    const start = resolveAnimStart(anim, cursor, prevStart, labels);
+    const readsCursor = anim.implicitPosition || typeof anim.position !== "number";
+    const start = cursorKnown || !readsCursor ? resolveAnimStart(anim, cursor, prevStart, labels) : null;
+    if (start == null || anim.durationUnresolved) cursorKnown = false;
     if (start != null) {
       anim.resolvedStart = Math.max(0, start);
       prevStart = anim.resolvedStart;
@@ -1659,7 +1698,15 @@ function resolveTimelinePositions(anims, labelDefs = []) {
   while (labelIdx < sortedLabels.length) defineLabel(sortedLabels[labelIdx++]);
 }
 function collectAddLabelDefs(ast, ref, scope, sortedCalls) {
-  const callLocs = sortedCalls.map((c) => c.node.callee?.property?.loc?.start);
+  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
@@ -1673,12 +1720,11 @@ function collectAddLabelDefs(ast, ref, scope, sortedCalls) {
       if (!name) return;
       const posVal = resolveNode(node.arguments?.[1], scope);
       const position = typeof posVal === "number" || typeof posVal === "string" ? posVal : void 0;
-      const labelLoc = callee.property?.loc?.start;
+      const labelStart = node.__hfSiteStart ?? callee.property?.start;
+      const labelOrder = node.__hfOrder;
       let order = sortedCalls.length;
-      if (labelLoc) {
-        order = callLocs.findIndex(
-          (l) => l && (l.line > labelLoc.line || l.line === labelLoc.line && l.column > labelLoc.column)
-        );
+      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 });
@@ -1692,13 +1738,17 @@ function compareByLoc(a, b) {
   if (!aLoc || !bLoc) return 0;
   return aLoc.line - bLoc.line || aLoc.column - bLoc.column;
 }
+function callSiteStart(call) {
+  return call.node.__hfSiteStart ?? call.node.callee?.property?.start;
+}
 function compareCallOrder(a, b) {
+  const aSite = callSiteStart(a);
+  const bSite = callSiteStart(b);
+  if (aSite !== void 0 && bSite !== void 0 && aSite !== bSite) return aSite - bSite;
   const ao = a.node.__hfOrder;
   const bo = b.node.__hfOrder;
-  if (ao === void 0 && bo === void 0) return compareByLoc(a, b);
-  if (ao === void 0) return -1;
-  if (bo === void 0) return 1;
-  return ao - bo;
+  if (ao !== void 0 && bo !== void 0) return ao - bo;
+  return compareByLoc(a, b);
 }
 function sortBySourcePosition(calls) {
   calls.sort(compareCallOrder);