@hyperframes/parsers 0.8.121 → 0.8.122

package/dist/gsapWriterAcorn.js

@@ -829,9 +829,10 @@ function findAllTweenCalls(ast, ref, scope, targetBindings) {
   return results;
 }
 var PERCENTAGE_KEY_RE = /^(\d+(?:\.\d+)?)%$/;
-function tryResolveStringProp(propValue, scope) {
+function tryResolveStringProp(propValue, scope, source) {
   const val = resolveNode(propValue, scope);
-  return typeof val === "string" ? val : void 0;
+  if (typeof val === "string") return val;
+  return source === void 0 ? void 0 : `__raw:${source.slice(propValue.start, propValue.end)}`;
 }
 function parsePercentageKeyframes(node, scope, source) {
   const keyframes = [];
@@ -858,9 +859,9 @@ function parsePercentageKeyframes(node, scope, source) {
       }
       keyframes.push({ percentage, properties, ...kfEase ? { ease: kfEase } : {} });
     } else if (key === "ease") {
-      ease = tryResolveStringProp(prop.value, scope) ?? ease;
+      ease = tryResolveStringProp(prop.value, scope, source) ?? ease;
     } else if (key === "easeEach") {
-      easeEach = tryResolveStringProp(prop.value, scope) ?? easeEach;
+      easeEach = tryResolveStringProp(prop.value, scope, source) ?? easeEach;
     }
   }
   keyframes.sort((a, b) => a.percentage - b.percentage);
@@ -1180,7 +1181,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) {
+    if (anim.ease === void 0 && defaults.ease !== void 0 && !anim.keyframes) {
       anim.ease = defaults.ease;
     }
   }
@@ -1853,7 +1854,7 @@ function preservedVarsEntries(varsNode, source) {
 function buildConvertedVarsCode(animation, varsNode, source) {
   const { fromProps, toProps } = conversionEndpoints(animation);
   const easeEach = animation.ease;
-  const easeEachEntry = easeEach ? `, easeEach: ${JSON.stringify(easeEach)}` : "";
+  const easeEachEntry = easeEach ? `, easeEach: ${valueToCode(easeEach)}` : "";
   const kfCode = `{ "0%": ${recordToCode(fromProps)}, "100%": ${recordToCode(toProps)}${easeEachEntry} }`;
   const entries = [`keyframes: ${kfCode}`, ...preservedVarsEntries(varsNode, source)];
   if (easeEach) entries.push(`ease: "none"`);
@@ -2330,7 +2331,7 @@ function buildCollapsedFlatVars(animation, collapse) {
 function buildKeyframesVarsCode(animation, fromProps, toProps, varsNode, source, setDuration) {
   const fromEntries = Object.entries(fromProps).map(([k, v]) => `${safeKey(k)}: ${valueToCode(v)}`);
   const toEntries = Object.entries(toProps).map(([k, v]) => `${safeKey(k)}: ${valueToCode(v)}`);
-  const easeEntry = animation.ease ? `, easeEach: ${JSON.stringify(animation.ease)}` : "";
+  const easeEntry = animation.ease ? `, easeEach: ${valueToCode(animation.ease)}` : "";
   const kfCode = `{ "0%": { ${fromEntries.join(", ")} }, "100%": { ${toEntries.join(", ")} }${easeEntry} }`;
   let preserved = preservedVarsEntries(varsNode, source);
   if (setDuration !== void 0) {
@@ -2384,11 +2385,11 @@ function convertToKeyframesFromScript(script, animationId, resolvedFromValues, s
 function buildKeyframeObjectCode(keyframes, easeEach) {
   const entries = mergePercentageKeyframes(keyframes).map((kf) => {
     const props = Object.entries(kf.properties).map(([k, v]) => `${safeKey(k)}: ${valueToCode(v)}`);
-    if (kf.ease) props.push(`ease: ${JSON.stringify(kf.ease)}`);
+    if (kf.ease) props.push(`ease: ${valueToCode(kf.ease)}`);
     if (kf.auto) props.push(`_auto: 1`);
     return `${JSON.stringify(`${kf.percentage}%`)}: { ${props.join(", ")} }`;
   });
-  if (easeEach) entries.push(`easeEach: ${JSON.stringify(easeEach)}`);
+  if (easeEach) entries.push(`easeEach: ${valueToCode(easeEach)}`);
   return `{ ${entries.join(", ")} }`;
 }
 function materializeKeyframesFromScript(script, animationId, keyframes, easeEach, resolvedSelector) {
@@ -2441,7 +2442,7 @@ function replaceTweenWithKeyframesInScript(script, animationId, edit) {
   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 (edit.ease) parts.push(`ease: ${valueToCode(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));
@@ -2459,7 +2460,7 @@ function addAnimationWithKeyframesToScript(script, targetSelector, position, dur
   const sorted = [...keyframes].sort((a, b) => a.percentage - b.percentage);
   const kfObjCode = buildKeyframeObjectCode(sorted, easeEach);
   const varParts = [`keyframes: ${kfObjCode}`, `duration: ${valueToCode(duration)}`];
-  if (ease) varParts.push(`ease: ${JSON.stringify(ease)}`);
+  if (ease) varParts.push(`ease: ${valueToCode(ease)}`);
   const stmtCode = `${parsed.timelineVar}.to(${JSON.stringify(targetSelector)}, { ${varParts.join(", ")} }, ${valueToCode(position)});`;
   const ms = new MagicString(script);
   ms.appendLeft(insertionPoint, "\n" + stmtCode);
@@ -3063,7 +3064,7 @@ function buildUnrollReplacement(timelineVar, animation, elements) {
   const calls = elements.map((el) => {
     const sorted = [...el.keyframes].sort((a, b) => a.percentage - b.percentage);
     const kfCode = buildKeyframeObjectCode(sorted, el.easeEach);
-    return `${timelineVar}.to(${JSON.stringify(el.selector)}, { keyframes: ${kfCode}, duration: ${duration}, ease: ${JSON.stringify(ease)} }, ${posCode});`;
+    return `${timelineVar}.to(${JSON.stringify(el.selector)}, { keyframes: ${kfCode}, duration: ${duration}, ease: ${valueToCode(ease)} }, ${posCode});`;
   });
   return calls.join("\n  ");
 }
@@ -3074,7 +3075,7 @@ function buildUnrollCallForElement(timelineVar, animation, el) {
   const posCode = typeof pos === "number" ? String(pos) : JSON.stringify(pos);
   const sorted = [...el.keyframes].sort((a, b) => a.percentage - b.percentage);
   const kfCode = buildKeyframeObjectCode(sorted, el.easeEach);
-  return `${timelineVar}.to(${JSON.stringify(el.selector)}, { keyframes: ${kfCode}, duration: ${duration}, ease: ${JSON.stringify(ease)} }, ${posCode});`;
+  return `${timelineVar}.to(${JSON.stringify(el.selector)}, { keyframes: ${kfCode}, duration: ${duration}, ease: ${valueToCode(ease)} }, ${posCode});`;
 }
 var REFUSE_UNROLL = /* @__PURE__ */ Symbol("refuse-unroll");
 function loopBodyRawStatements(loopNode) {