@pixodesk/svg-animator-core 1.0.29 → 1.0.34

package/dist/index.cjs

@@ -93,15 +93,17 @@ __export(index_exports, {
   PxScrollRangeSchema: () => PxScrollRangeSchema,
   PxScrollSchema: () => PxScrollSchema,
   PxStrokeGradientEffectSchema: () => PxStrokeGradientEffectSchema,
+  PxStrokeTrimEffectSchema: () => PxStrokeTrimEffectSchema,
+  PxStrokeTrimSubPaths: () => PxStrokeTrimSubPaths,
   PxSvgNodeExtra: () => PxSvgNodeExtra,
   PxTextEffectSchema: () => PxTextEffectSchema,
   PxTextPathEffectSchema: () => PxTextPathEffectSchema,
+  PxTimelinePinSchema: () => PxTimelinePinSchema,
+  PxTimelineSchema: () => PxTimelineSchema,
   PxTransformByEffectSchema: () => PxTransformByEffectSchema,
   PxTransformPartsSchema: () => PxTransformPartsSchema,
   PxTransformValueSchema: () => PxTransformValueSchema,
   PxTriggerSchema: () => PxTriggerSchema,
-  PxTrimPathEffectSchema: () => PxTrimPathEffectSchema,
-  PxTrimSubPaths: () => PxTrimSubPaths,
   STYLE_ATTR_NAMES: () => STYLE_ATTR_NAMES,
   TEXT_ATTR: () => TEXT_ATTR,
   TEXT_CONTENT_ATTR: () => TEXT_CONTENT_ATTR,
@@ -121,6 +123,7 @@ __export(index_exports, {
   diffInEffect: () => diffInEffect,
   evaluateMotionPathSegment: () => evaluateMotionPathSegment,
   extendedPathForBrowser: () => extendedPathForBrowser,
+  flattenAnimatorTimeline: () => flattenAnimatorTimeline,
   generateNewIds: () => generateNewIds,
   generateUniqueId: () => generateUniqueId,
   getAnimatorConfig: () => getAnimatorConfig,
@@ -146,6 +149,9 @@ __export(index_exports, {
   materialiseInternalLoopsInTree: () => materialiseInternalLoopsInTree,
   materialiseMotionPathInPropAnim: () => materialiseMotionPathInPropAnim,
   materialiseMotionPathsInTree: () => materialiseMotionPathsInTree,
+  mergeStaticTransformIntoAnimDef: () => mergeStaticTransformIntoAnimDef,
+  nestAnimatorTimeline: () => nestAnimatorTimeline,
+  parseTransformParts: () => parseTransformParts,
   propAnimIsMotionPath: () => propAnimIsMotionPath,
   px: () => px,
   resolveStyle: () => resolveStyle,
@@ -419,6 +425,38 @@ function composeTransformParts(parts, opts) {
   if (o) segs.push("translate(" + -o[0] + tu + "," + -o[1] + tu + ")");
   return segs.join("");
 }
+function parseTransformParts(str2) {
+  var _a, _b;
+  if (!str2 || typeof str2 !== "string") return void 0;
+  const out = {};
+  const re = /([a-zA-Z]+)\s*\(([^)]*)\)/g;
+  const order = ["translate", "rotate", "skewX", "scale"];
+  let lastIdx = -1;
+  let m;
+  while ((m = re.exec(str2)) !== null) {
+    const fn = m[1];
+    const idx = order.indexOf(fn);
+    if (idx < 0 || idx <= lastIdx) return void 0;
+    lastIdx = idx;
+    const nums = m[2].split(/[\s,]+/).filter(Boolean).map(Number);
+    if (nums.some((n) => Number.isNaN(n))) return void 0;
+    if (fn === "translate") {
+      if (nums.length < 1 || nums.length > 2) return void 0;
+      out.translate = [nums[0], (_a = nums[1]) != null ? _a : 0];
+    } else if (fn === "rotate") {
+      if (nums.length !== 1) return void 0;
+      out.rotate = nums[0];
+    } else if (fn === "skewX") {
+      if (nums.length !== 1) return void 0;
+      out.skew = nums[0];
+    } else {
+      if (nums.length < 1 || nums.length > 2) return void 0;
+      out.scale = [nums[0], (_b = nums[1]) != null ? _b : nums[0]];
+    }
+  }
+  if (str2.replace(/([a-zA-Z]+)\s*\(([^)]*)\)/g, "").replace(/[\s,]/g, "").length) return void 0;
+  return Object.keys(out).length ? out : void 0;
+}
 var STYLE_ATTR_NAMES = /* @__PURE__ */ new Set(["offset-distance", "offsetDistance"]);
 var DEFAULT_DURATION_MS = 1e3;
 function kebabToCamelCaseWord(kebab) {
@@ -750,6 +788,8 @@ var Union = class extends Base {
   constructor(schemas, defaultVal) {
     super();
     this.schemas = schemas;
+    /** Structural tag read by {@link describeSchema} — `schemas` alone cannot tell Union from Tuple. */
+    this._kind = "union";
     this._default = defaultVal != null ? defaultVal : schemas[0]._default;
   }
   sanitize(raw) {
@@ -774,6 +814,8 @@ var DiscriminatedUnion = class extends Base {
     super();
     this._key = _key;
     this._schemas = _schemas;
+    /** Structural tag read by {@link describeSchema}. */
+    this._kind = "discriminatedUnion";
     this._default = defaultVal != null ? defaultVal : _schemas[0]._default;
     this._map = /* @__PURE__ */ new Map();
     for (const s of _schemas) {
@@ -936,6 +978,8 @@ var Rec = class extends Base {
   constructor(value) {
     super();
     this.value = value;
+    /** Structural tag read by {@link describeSchema}. */
+    this._kind = "record";
     this._default = {};
   }
   sanitize(raw) {
@@ -1021,6 +1065,8 @@ var Tuple = class extends Base {
   constructor(schemas) {
     super();
     this.schemas = schemas;
+    /** Structural tag read by {@link describeSchema} — `schemas` alone cannot tell Tuple from Union. */
+    this._kind = "tuple";
     this._default = schemas.map((s) => s._default);
   }
   sanitize(raw) {
@@ -1057,10 +1103,20 @@ function schemaKeys(schema) {
 function describeSchema(schema) {
   var _a;
   const s = schema;
-  if ("_shape" in s) return { kind: "shape", shape: s._shape };
+  switch (s._kind) {
+    case "union":
+      return { kind: "union", members: s.schemas };
+    case "discriminatedUnion":
+      return { kind: "discriminatedUnion", key: s._key, members: s._schemas };
+    case "record":
+      return { kind: "record", value: s.value };
+    case "tuple":
+      return { kind: "tuple", items: s.schemas };
+  }
+  if ("_shape" in s) return { kind: "shape", shape: s._shape, openValue: s._openSchema };
   if ("item" in s) return { kind: "array", item: s.item };
   if ("inner" in s) return { kind: "optional", inner: s.inner };
-  if ("fn" in s) return { kind: "lazy", resolved: (_a = s.resolved) != null ? _a : s.fn() };
+  if ("fn" in s) return { kind: "lazy", resolved: (_a = s.resolved) != null ? _a : s.resolved = s.fn() };
   return { kind: "leaf" };
 }
 var px = {
@@ -1162,7 +1218,7 @@ var PxTextPathSpacing = {
   auto: "auto",
   exact: "exact"
 };
-var PxTrimSubPaths = {
+var PxStrokeTrimSubPaths = {
   separate: "separate",
   combined: "combined"
 };
@@ -1200,7 +1256,107 @@ function isPxElementFileFormat(fileJson) {
 }
 function getAnimatorConfig(doc) {
   var _a;
-  return (doc == null ? void 0 : doc.animator) || ((_a = doc == null ? void 0 : doc.meta) == null ? void 0 : _a.animator);
+  const cfg = (doc == null ? void 0 : doc.animator) || ((_a = doc == null ? void 0 : doc.meta) == null ? void 0 : _a.animator);
+  return cfg ? flattenAnimatorTimeline(cfg) : void 0;
+}
+var flattenMemo = /* @__PURE__ */ new WeakMap();
+function flattenAnimatorTimeline(cfg) {
+  const timeline = cfg.timeline;
+  if (timeline === void 0 || timeline === null || typeof timeline !== "object") return cfg;
+  const memoised = flattenMemo.get(cfg);
+  if (memoised) return memoised;
+  const _a = cfg, { timeline: _dropped } = _a, flat = __objRest(_a, ["timeline"]);
+  if (timeline.type === "scroll" || timeline.type === "view") {
+    flat.timelineSource = "scroll";
+    if (timeline.duration !== void 0) flat.duration = timeline.duration;
+    if (timeline.iterations !== void 0) flat.iterations = timeline.iterations;
+    const scroll = __spreadValues({}, flat.scroll || {});
+    scroll.kind = timeline.type;
+    if (timeline.engine !== void 0) scroll.driver = timeline.engine;
+    if (timeline.axis !== void 0) scroll.axis = timeline.axis;
+    if (timeline.source !== void 0) scroll.source = timeline.source;
+    if (timeline.subject !== void 0) scroll.subject = timeline.subject;
+    if (timeline.smoothing !== void 0) scroll.smoothing = timeline.smoothing;
+    if (timeline.range !== void 0) scroll.range = timeline.range;
+    const pin = timeline.pin;
+    if (typeof pin === "boolean") scroll.pin = pin;
+    else if (pin && typeof pin === "object") {
+      scroll.pin = true;
+      if (pin.align !== void 0) scroll.pinAlign = pin.align;
+      if (pin.top !== void 0) scroll.pinTop = pin.top;
+      if (pin.distance !== void 0) scroll.pinDistance = pin.distance;
+    }
+    flat.scroll = scroll;
+  } else {
+    if (timeline.duration !== void 0) flat.duration = timeline.duration;
+    if (timeline.trigger !== void 0) {
+      const _b = timeline.trigger, { onFinish } = _b, restTrigger = __objRest(_b, ["onFinish"]);
+      if (Object.keys(restTrigger).length) flat.trigger = restTrigger;
+      if (onFinish !== void 0) flat.resetOnFinish = onFinish === "reset";
+    }
+    if (timeline.delay !== void 0) flat.delay = timeline.delay;
+    if (timeline.iterations !== void 0) flat.iterations = timeline.iterations;
+    if (timeline.direction !== void 0) flat.direction = timeline.direction;
+    if (timeline.fill !== void 0) flat.fill = timeline.fill;
+  }
+  flattenMemo.set(cfg, flat);
+  return flat;
+}
+function nestAnimatorTimeline(cfg) {
+  if (!cfg || cfg.timeline !== void 0) return cfg;
+  const _a = cfg, {
+    timelineSource,
+    scroll,
+    trigger,
+    delay,
+    iterations,
+    direction,
+    fill,
+    resetOnFinish,
+    duration
+  } = _a, shared = __objRest(_a, [
+    "timelineSource",
+    "scroll",
+    "trigger",
+    "delay",
+    "iterations",
+    "direction",
+    "fill",
+    "resetOnFinish",
+    "duration"
+  ]);
+  if (timelineSource === "scroll") {
+    const timeline2 = { type: (scroll == null ? void 0 : scroll.kind) === "view" ? "view" : "scroll" };
+    if (duration !== void 0) timeline2.duration = duration;
+    if (typeof iterations === "number") timeline2.iterations = iterations;
+    if (scroll) {
+      if (scroll.driver !== void 0) timeline2.engine = scroll.driver;
+      if (scroll.axis !== void 0) timeline2.axis = scroll.axis;
+      if (scroll.source !== void 0) timeline2.source = scroll.source;
+      if (scroll.subject !== void 0) timeline2.subject = scroll.subject;
+      if (scroll.smoothing !== void 0) timeline2.smoothing = scroll.smoothing;
+      if (scroll.range !== void 0) timeline2.range = scroll.range;
+      const hasPinParams = scroll.pinAlign !== void 0 || scroll.pinTop !== void 0 || scroll.pinDistance !== void 0;
+      if (hasPinParams) {
+        timeline2.pin = __spreadValues(__spreadValues(__spreadValues({}, scroll.pinAlign !== void 0 ? { align: scroll.pinAlign } : {}), scroll.pinTop !== void 0 ? { top: scroll.pinTop } : {}), scroll.pinDistance !== void 0 ? { distance: scroll.pinDistance } : {});
+      } else if (scroll.pin !== void 0) {
+        timeline2.pin = scroll.pin;
+      }
+    }
+    return __spreadProps(__spreadValues({}, shared), { timeline: timeline2 });
+  }
+  const timeline = { type: "clock" };
+  if (duration !== void 0) timeline.duration = duration;
+  if (trigger !== void 0 || resetOnFinish) {
+    const t = __spreadValues({}, trigger || {});
+    if (resetOnFinish) t.onFinish = "reset";
+    timeline.trigger = t;
+  }
+  if (delay !== void 0) timeline.delay = delay;
+  if (iterations !== void 0) timeline.iterations = iterations;
+  if (direction !== void 0) timeline.direction = direction;
+  if (fill !== void 0) timeline.fill = fill;
+  return Object.keys(timeline).length > 1 ? __spreadProps(__spreadValues({}, shared), { timeline }) : shared;
 }
 function getDefs(doc) {
   var _a;
@@ -1212,7 +1368,7 @@ function getBindings(doc) {
   if (!doc) return void 0;
   const animateById = (_a = getAnimatorConfig(doc)) == null ? void 0 : _a.animateById;
   if (!animateById) return void 0;
-  return Object.entries(animateById).map(([id, anim]) => ({ id, animate: anim }));
+  return Object.entries(animateById).map(([id, anim]) => ({ id: id.startsWith("#") ? id.slice(1) : id, animate: anim }));
 }
 function getChildren(doc) {
   return doc == null ? void 0 : doc.children;
@@ -1228,27 +1384,27 @@ var PxKeyframeValueSchema = implementsInterface()(px.union([
   // e.g. for colors
   px.number(),
   px.array(px.number()),
-  px.lazy(() => PxTransformPartsSchema, {}),
+  // ORDER LAW: the key-discriminated object shapes (`{path}`, `{paths}`) come BEFORE the
+  // all-optional transform-parts record. In default (non-strict) mode that record accepts
+  // ANY object (every key optional, unknown keys ignored), so listing it earlier made
+  // Union.sanitize route `{path}`/`{paths}` values into it and strip them to `{}` —
+  // silent morph-data loss (repro: the editor's keyframeValueSanitize spec). Validity is
+  // order-independent (`some()`); only sanitize routing depends on this order.
   px.object({ path: px.string() }),
   px.lazy(() => px.object({ paths: px.array(PxBezierPathSchema) }), { paths: [] }),
   // Gradient `stops` timeline — each kf value is the full stops-array snapshot.
-  px.lazy(() => px.array(PxGradientStopSchema), [])
+  px.lazy(() => px.array(PxGradientStopSchema), []),
+  px.lazy(() => PxTransformPartsSchema, {})
 ]));
 var PxKeyframeSchema = implementsInterface()(px.object({
   time: px.number().optional(),
-  t: px.number().optional(),
   value: PxKeyframeValueSchema.optional(),
-  v: PxKeyframeValueSchema.optional(),
   easing: PxEasingOrRefSchema.optional(),
-  e: PxEasingOrRefSchema.optional(),
   tangentOut: px.tuple([px.number(), px.number()]).optional(),
-  to: px.tuple([px.number(), px.number()]).optional(),
-  // short alias
-  tangentIn: px.tuple([px.number(), px.number()]).optional(),
-  ti: px.tuple([px.number(), px.number()]).optional(),
-  // short alias
-  selected: px.boolean().optional()
-  // editor-side UI state (Player ignores it)
+  tangentIn: px.tuple([px.number(), px.number()]).optional()
+  // (`selected` — editor timeline-selection UI state — was REMOVED from the wire
+  // (review §1.3): editor data lives under `meta`. The editor still carries it on
+  // its internal COPY-PASTE payload, which never validates against this schema.)
 }));
 var PxLoopSchema = implementsInterface()(px.object({
   segmentCount: px.number().optional(),
@@ -1258,7 +1414,6 @@ var PxLoopSchema = implementsInterface()(px.object({
 var PxPropertyAnimationSchema = implementsInterface()(px.object({
   value: PxKeyframeValueSchema.optional(),
   keyframes: px.array(PxKeyframeSchema).optional(),
-  kfs: px.array(PxKeyframeSchema).optional(),
   loop: px.union([PxLoopSchema, px.boolean()]).optional(),
   autoOrient: px.boolean().optional()
 }));
@@ -1286,6 +1441,11 @@ var PxElementAnimationSchema = implementsInterface()(px.union([
 var PxTriggerSchema = implementsInterface()(px.object({
   startOn: px.enum(["load", "mouseOver", "click", "scrollIntoView", "programmatic"]).optional(),
   outAction: px.enum(["continue", "pause", "reset", "reverse"]).optional(),
+  // What happens after a NATURAL finish — `'hold'` (default: keep the end state per
+  // `fill`) or `'reset'` (snap back to the start state). The trigger-vocabulary home of
+  // the old top-level `resetOnFinish: boolean` (read-legacy) — review §2.3: both
+  // "what happens at the end" knobs now sit side by side and share one style of value.
+  onFinish: px.enum(["hold", "reset"]).optional(),
   scrollIntoViewThreshold: px.number().optional()
 }));
 var PxGlyphSchema = implementsInterface()(px.object({
@@ -1293,8 +1453,8 @@ var PxGlyphSchema = implementsInterface()(px.object({
   d: px.string()
 }));
 var PxGlyphFontSchema = implementsInterface()(px.object({
-  fFamily: px.string(),
-  style: px.string(),
+  fontFamily: px.string(),
+  fontStyle: px.string(),
   ascent: px.number(),
   unitsPerEm: px.number(),
   glyphs: px.record(PxGlyphSchema)
@@ -1302,7 +1462,9 @@ var PxGlyphFontSchema = implementsInterface()(px.object({
 var PxDefsSchema = implementsInterface()(px.object({
   easings: px.record(px.tuple([px.number(), px.number(), px.number(), px.number()])).optional(),
   animations: px.record(PxAnimationDefinitionSchema).optional(),
-  styles: px.record(px.any()).optional(),
+  // Review §2.6: the schema now matches the declared type — a style preset is a flat
+  // record of string|number attribute values, nothing nested.
+  styles: px.record(px.record(px.union([px.string(), px.number()]))).optional(),
   glyphs: px.record(PxGlyphFontSchema).optional()
 }));
 var PX_SCROLL_PHASES = ["cover", "contain", "entry", "exit", "entry-crossing", "exit-crossing"];
@@ -1328,22 +1490,54 @@ var PxScrollSchema = implementsInterface()(px.object({
   pinDistance: px.number().optional(),
   range: PxScrollRangeSchema.optional()
 }));
-var PxAnimatorConfigSchema = implementsInterface()(px.object({
-  mode: px.enum([PxAnimatorMode.auto, PxAnimatorMode.waapi, PxAnimatorMode.frames]).optional(),
+var PxTimelinePinSchema = px.object({
+  align: px.enum(["top", "center", "bottom"]).optional(),
+  top: px.number().optional(),
+  distance: px.number().optional()
+});
+var PxClockTimelineSchema = px.object({
+  type: px.literal("clock"),
+  // §2.8: duration is a property of the TIMELINE — how long one pass takes.
   duration: px.number().optional(),
+  trigger: PxTriggerSchema.optional(),
   delay: px.number().optional(),
-  // LAW (SCHEMA-DESIGN R3, S10): the ONE sanctioned string-in-number union
-  // (CSS animation-iteration-count familiarity) — do not add more mixed unions.
   iterations: px.union([px.number(), px.literal("infinite")]).optional(),
   fill: px.enum(["forwards", "backwards", "both", "none"]).optional(),
-  direction: px.enum(["normal", "reverse", "alternate", "alternate-reverse"]).optional(),
+  direction: px.enum(["normal", "reverse", "alternate", "alternate-reverse"]).optional()
+});
+var scrollishTimelineShape = {
+  // §2.8: duration is a property of the TIMELINE — under scrubbing it is the keyframe
+  // span the scroll range maps onto.
+  duration: px.number().optional(),
+  // Finite repeat count IS meaningful when scrubbing — the scroll range maps onto
+  // duration × iterations (rule D4; `'infinite'` cannot map to a range, so no literal here).
+  iterations: px.number().optional(),
+  engine: px.enum(["custom", "native"]).optional(),
+  axis: px.enum(["block", "inline", "x", "y"]).optional(),
+  source: px.enum(["nearest", "root"]).optional(),
+  subject: px.string().optional(),
+  // 'parent' | 'scroller' | any CSS selector
+  smoothing: px.number().optional(),
+  // ms
+  pin: px.union([px.boolean(), PxTimelinePinSchema]).optional(),
+  range: PxScrollRangeSchema.optional()
+};
+var PxScrollTimelineSchema = px.object(__spreadValues({ type: px.literal("scroll") }, scrollishTimelineShape));
+var PxViewTimelineSchema = px.object(__spreadValues({ type: px.literal("view") }, scrollishTimelineShape));
+var PxTimelineSchema = px.discriminatedUnion("type", [
+  PxClockTimelineSchema,
+  PxScrollTimelineSchema,
+  PxViewTimelineSchema
+]);
+var PxAnimatorConfigSchema = implementsInterface()(px.object({
+  mode: px.enum([PxAnimatorMode.auto, PxAnimatorMode.waapi, PxAnimatorMode.frames]).optional(),
+  // (`duration` lives INSIDE `timeline` on the wire — §2.8; the flat field below
+  // exists only on the runtime view, like the rest of the playback dynamics.)
   frameRate: px.number().optional(),
-  trigger: PxTriggerSchema.optional(),
-  resetOnFinish: px.boolean().optional(),
+  // THE spelling of "what advances progress" — clock / scroll / view (review §2.1).
+  timeline: PxTimelineSchema.optional(),
   definitions: PxDefsSchema.optional(),
   animateById: px.record(PxElementAnimationSchema).optional(),
-  timelineSource: px.string().optional(),
-  scroll: PxScrollSchema.optional(),
   debugInstName: px.string().optional()
 }));
 var PxBindingSchema = implementsInterface()(px.object({
@@ -1362,18 +1556,18 @@ var PxAttrValueSchema = px.union([
 ]);
 var PxAnimatableNumberSchema = px.union([
   px.number(),
-  px.object({ value: px.number() }),
-  PxPropertyAnimationSchema
+  PxPropertyAnimationSchema,
+  px.object({ value: px.number() })
 ]);
 var PxAnimatableVec2Schema = px.union([
   px.tuple([px.number(), px.number()]),
-  px.object({ value: px.tuple([px.number(), px.number()]) }),
-  PxPropertyAnimationSchema
+  PxPropertyAnimationSchema,
+  px.object({ value: px.tuple([px.number(), px.number()]) })
 ]);
 var PxAnimatableStringSchema = px.union([
   px.string(),
-  px.object({ value: px.string() }),
-  PxPropertyAnimationSchema
+  PxPropertyAnimationSchema,
+  px.object({ value: px.string() })
 ]);
 var PxTransformByEffectSchema = implementsInterface()(px.object({
   translate: PxAnimatableVec2Schema.optional(),
@@ -1403,16 +1597,14 @@ var PxMaskedByEffectSchema = implementsInterface()(px.object({
   height: px.number().optional()
 }));
 var PxClipPathEffectSchema = implementsInterface()(px.object({
-  d: PxAnimatableStringSchema.optional(),
-  animate: PxPropertyAnimationSchema.optional()
+  d: PxAnimatableStringSchema.optional()
 }));
-var PxTrimPathEffectSchema = implementsInterface()(px.object({
+var PxStrokeTrimEffectSchema = implementsInterface()(px.object({
   offset: PxAnimatableNumberSchema.optional(),
   range: PxAnimatableVec2Schema.optional(),
-  subPaths: px.enum([PxTrimSubPaths.separate, PxTrimSubPaths.combined]).optional()
+  subPaths: px.enum([PxStrokeTrimSubPaths.separate, PxStrokeTrimSubPaths.combined]).optional()
 }));
 var PxRetimeEffectSchema = implementsInterface()(px.object({
-  sourceId: px.string().optional(),
   start: px.number().optional(),
   stretch: px.number().optional(),
   timeCrop: px.tuple([px.number(), px.number()]).optional()
@@ -1435,11 +1627,11 @@ var PxAnimatableGradientStopsSchema = px.union([
 var PxFillGradientEffectSchema = implementsInterface()(px.object({
   // Contextual kind — the `type` convention, see `PxNodeBase.type`.
   type: px.enum([PxGradientType.linear, PxGradientType.radial]),
-  p1: PxAnimatableVec2Schema.optional(),
-  p2: PxAnimatableVec2Schema.optional(),
-  c: PxAnimatableVec2Schema.optional(),
-  r: PxAnimatableNumberSchema.optional(),
-  fp: PxAnimatableVec2Schema.optional(),
+  start: PxAnimatableVec2Schema.optional(),
+  end: PxAnimatableVec2Schema.optional(),
+  center: PxAnimatableVec2Schema.optional(),
+  radius: PxAnimatableNumberSchema.optional(),
+  focal: PxAnimatableVec2Schema.optional(),
   stops: PxAnimatableGradientStopsSchema.optional(),
   gradientUnits: px.enum([PxGradientUnits.userSpaceOnUse, PxGradientUnits.objectBoundingBox]).optional(),
   spreadMethod: px.enum([PxGradientSpreadMethod.pad, PxGradientSpreadMethod.reflect, PxGradientSpreadMethod.repeat]).optional(),
@@ -1463,7 +1655,7 @@ var PxEffectsSchema = implementsInterface()(px.object({
   repeater: PxRepeaterEffectSchema.optional(),
   maskedBy: PxMaskedByEffectSchema.optional(),
   clipPath: PxClipPathEffectSchema.optional(),
-  trimPath: PxTrimPathEffectSchema.optional(),
+  strokeTrim: PxStrokeTrimEffectSchema.optional(),
   clone: PxCloneEffectSchema.optional(),
   fillGradient: PxFillGradientEffectSchema.optional(),
   strokeGradient: PxStrokeGradientEffectSchema.optional(),
@@ -1635,9 +1827,11 @@ function generateNewIds(doc) {
   const docAnimate = (_a = cloned.animator) == null ? void 0 : _a.animateById;
   if (docAnimate && typeof docAnimate === "object") {
     const updatedAnimate = {};
-    for (const [id, anim] of Object.entries(docAnimate)) {
+    for (const [key, anim] of Object.entries(docAnimate)) {
+      const hashed = key.startsWith("#");
+      const id = hashed ? key.slice(1) : key;
       const newId = (_b = idMap.get(id)) != null ? _b : id;
-      updatedAnimate[newId] = anim;
+      updatedAnimate[hashed ? "#" + newId : newId] = anim;
     }
     cloned.animator = __spreadProps(__spreadValues({}, cloned.animator), { animateById: updatedAnimate });
   }
@@ -1730,7 +1924,7 @@ function getNormalizedProps(props) {
     let value = props[rawKey];
     if (COLOUR_ATTR_NAMES.has(key) && Array.isArray(value)) {
       propsCopy[key] = toRGBA(value);
-    } else if (key === "transform" && value !== null && typeof value === "object" && !Array.isArray(value) && !value.keyframes && !value.kfs) {
+    } else if (key === "transform" && value !== null && typeof value === "object" && !Array.isArray(value) && !value.keyframes) {
       const parts = value.value && typeof value.value === "object" ? value.value : value;
       propsCopy["transform"] = composeTransformParts(parts, { withUnits: false });
     } else if (TRANSFORM_FN_NAMES.has(key)) {
@@ -1770,12 +1964,12 @@ function getKfEasing(kf) {
   return (_a = kf.easing) != null ? _a : kf.e;
 }
 function propAnimIsMotionPath(anim) {
-  var _a, _b, _c;
-  const kfs = (_a = anim.keyframes) != null ? _a : anim.kfs;
+  var _a, _b;
+  const kfs = anim.keyframes;
   if (!Array.isArray(kfs)) return false;
   if (anim.autoOrient) return true;
   for (const kf of kfs) {
-    if (((_b = kf.tangentIn) != null ? _b : kf.ti) || ((_c = kf.tangentOut) != null ? _c : kf.to)) return true;
+    if (((_a = kf.tangentIn) != null ? _a : kf.ti) || ((_b = kf.tangentOut) != null ? _b : kf.to)) return true;
   }
   return false;
 }
@@ -1836,14 +2030,14 @@ var DEFAULT_FLATNESS_TOL = 0.5;
 var DEFAULT_ROTATION_TOL = 5;
 var DEFAULT_MAX_SAMPLES = 32;
 function materialiseMotionPathInPropAnim(anim, opts) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   if (!propAnimIsMotionPath(anim)) return anim;
-  const kfs = (_a = anim.keyframes) != null ? _a : anim.kfs;
+  const kfs = anim.keyframes;
   if (!Array.isArray(kfs) || kfs.length < 2) return anim;
   const autoOrient = !!anim.autoOrient;
-  const flatnessTol = (_b = opts == null ? void 0 : opts.flatnessTolerance) != null ? _b : DEFAULT_FLATNESS_TOL;
-  const rotationTol = (_c = opts == null ? void 0 : opts.rotationTolerance) != null ? _c : DEFAULT_ROTATION_TOL;
-  const maxSamples = (_d = opts == null ? void 0 : opts.maxSamplesPerSegment) != null ? _d : DEFAULT_MAX_SAMPLES;
+  const flatnessTol = (_a = opts == null ? void 0 : opts.flatnessTolerance) != null ? _a : DEFAULT_FLATNESS_TOL;
+  const rotationTol = (_b = opts == null ? void 0 : opts.rotationTolerance) != null ? _b : DEFAULT_ROTATION_TOL;
+  const maxSamples = (_c = opts == null ? void 0 : opts.maxSamplesPerSegment) != null ? _c : DEFAULT_MAX_SAMPLES;
   const out = [];
   const firstPos = getKfTranslate(kfs[0]);
   if (!firstPos) return anim;
@@ -1872,7 +2066,7 @@ function materialiseMotionPathInPropAnim(anim, opts) {
   const lastInE = getKfEasing(kfs[kfs.length - 1]);
   if (lastInE) out[out.length - 1].e = lastInE;
   if (autoOrient) unwrapAutoOrientRotations(out);
-  const result = { kfs: out };
+  const result = { keyframes: out };
   if (anim.loop !== void 0) result.loop = anim.loop;
   return result;
 }
@@ -2534,7 +2728,7 @@ function expandLoopKeyframes(propName, keyframes, loop, duration) {
 }
 function normalizeKeyframes(propName, propAnim, duration, defs) {
   var _a, _b, _c, _d, _e, _f, _g;
-  const keyframes = propAnim.keyframes || propAnim.kfs || [];
+  const keyframes = propAnim.keyframes || [];
   const normalized = [];
   for (const kf of keyframes) {
     const timePct = (_b = (_a = kf.time) != null ? _a : kf.t) != null ? _b : 0;
@@ -2579,17 +2773,16 @@ function mergeAnimationDefinitions(animations) {
   return merged;
 }
 function materialiseInternalLoopsInPropAnim(propName, propAnim, duration) {
-  var _a;
   const loopRaw = propAnim.loop;
   if (loopRaw === void 0 || loopRaw === null || loopRaw === false) return propAnim;
   const loop = loopRaw === true ? {} : loopRaw;
-  const rawKfs = (_a = propAnim.keyframes) != null ? _a : propAnim.kfs;
+  const rawKfs = propAnim.keyframes;
   if (!Array.isArray(rawKfs) || rawKfs.length < 2) return propAnim;
   const propNameKebab = isCamelCaseWord(propName) ? camelCaseToKebabWordIfNeeded(propName) : propName;
   const isColour = COLOUR_ATTR_NAMES.has(propNameKebab);
   const kfs = rawKfs.map((kf) => {
-    var _a2, _b, _c, _d, _e, _f, _g, _h;
-    const t = (_a2 = kf.t) != null ? _a2 : kf.time;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const t = (_a = kf.t) != null ? _a : kf.time;
     let v = (_b = kf.v) != null ? _b : kf.value;
     if (propName === "d") v = normalizePathValue(v);
     if (isColour) v = (_c = parseColor(v)) != null ? _c : v;
@@ -2600,7 +2793,7 @@ function materialiseInternalLoopsInPropAnim(propName, propAnim, duration) {
     return out2;
   });
   const expanded = expandLoopKeyframes(propName, kfs, loop, duration);
-  const out = { kfs: expanded };
+  const out = { keyframes: expanded };
   if (propAnim.autoOrient !== void 0) out.autoOrient = propAnim.autoOrient;
   return out;
 }
@@ -2642,6 +2835,36 @@ var _elementIdCounter = 0;
 function generateElementId() {
   return "_px_el_" + ++_elementIdCounter;
 }
+function mergeStaticTransformIntoAnimDef(animDef, staticTransform) {
+  if (!animDef) return animDef;
+  const staticParts = staticTransform && typeof staticTransform === "object" && !Array.isArray(staticTransform) ? staticTransform : parseTransformParts(staticTransform);
+  if (!staticParts || !Object.keys(staticParts).length) return animDef;
+  const mergeKfValue = (v) => v && typeof v === "object" && !Array.isArray(v) ? __spreadValues(__spreadValues({}, staticParts), v) : v;
+  const transformAnim = animDef["transform"];
+  if (transformAnim && typeof transformAnim === "object") {
+    const anim = transformAnim;
+    if (Array.isArray(anim.keyframes)) {
+      const out = __spreadProps(__spreadValues({}, anim), {
+        keyframes: anim.keyframes.map((kf) => __spreadProps(__spreadValues({}, kf), { value: mergeKfValue(kf.value) }))
+      });
+      if (out.value !== void 0) out.value = mergeKfValue(out.value);
+      return __spreadProps(__spreadValues({}, animDef), { transform: out });
+    }
+    return animDef;
+  }
+  const channels = Object.keys(animDef).filter((k) => TRANSFORM_FN_NAMES.has(k));
+  if (channels.length !== 1) return animDef;
+  const ch = channels[0];
+  const chAnim = animDef[ch];
+  if (!chAnim || typeof chAnim !== "object" || !Array.isArray(chAnim.keyframes)) return animDef;
+  const lifted = __spreadProps(__spreadValues({}, chAnim), {
+    keyframes: chAnim.keyframes.map((kf) => __spreadProps(__spreadValues({}, kf), { value: __spreadProps(__spreadValues({}, staticParts), { [ch]: kf.value }) }))
+  });
+  if (lifted.value !== void 0) lifted.value = __spreadProps(__spreadValues({}, staticParts), { [ch]: lifted.value });
+  const rest = __spreadValues({}, animDef);
+  delete rest[ch];
+  return __spreadProps(__spreadValues({}, rest), { transform: lifted });
+}
 function normalizeAnimationDefinition(animDef, duration, defs, engine = PxAnimatorEngine.waapi) {
   const normalized = {};
   for (const [propName, propAnim] of Object.entries(animDef)) {
@@ -2650,7 +2873,7 @@ function normalizeAnimationDefinition(animDef, duration, defs, engine = PxAnimat
     }
     const normalizedKfs = normalizeKeyframes(propName, propAnim, duration, defs);
     if (normalizedKfs.length > 0) {
-      const out = { kfs: normalizedKfs };
+      const out = { keyframes: normalizedKfs };
       if (propAnim.autoOrient !== void 0) out.autoOrient = propAnim.autoOrient;
       if (propAnim.loop !== void 0) out.loop = propAnim.loop;
       normalized[propName] = engine === PxAnimatorEngine.waapi && propName === "transform" ? materialiseMotionPathInPropAnim(out) : out;
@@ -2663,11 +2886,11 @@ function getNormalisedBindings(doc, engine = PxAnimatorEngine.waapi) {
   const defs = getDefs(doc);
   const duration = animatorConfig.duration || 1e3;
   const bindings = [];
-  const processAnimation = (id, animate) => {
+  const processAnimation = (id, animate, staticTransform) => {
     if (!animate) return null;
     const animDefs = resolveElementAnimation(animate, defs);
     if (animDefs.length === 0) return null;
-    const merged = mergeAnimationDefinitions(animDefs);
+    const merged = mergeStaticTransformIntoAnimDef(mergeAnimationDefinitions(animDefs), staticTransform);
     const normalizedAnim = normalizeAnimationDefinition(merged, duration, defs, engine);
     if (Object.keys(normalizedAnim).length === 0) return null;
     return {
@@ -2687,7 +2910,7 @@ function getNormalisedBindings(doc, engine = PxAnimatorEngine.waapi) {
     if (inlineAnim && Object.keys(inlineAnim).length > 0) {
       const nodeId = node.id || generateElementId();
       node.id = nodeId;
-      const normalized = processAnimation(nodeId, inlineAnim);
+      const normalized = processAnimation(nodeId, inlineAnim, node.transform);
       if (normalized) bindings.push(normalized);
     }
     if (node.children) {
@@ -2725,7 +2948,7 @@ function getKeyframesPair(keyframes, progress) {
 }
 function calcPropertyValue(propName, propAnim, progress) {
   var _a, _b, _c, _d, _e, _f, _g;
-  const keyframes = propAnim.kfs || propAnim.keyframes || [];
+  const keyframes = propAnim.keyframes || [];
   if (keyframes.length === 0) return null;
   const { prevKf, nextKf } = getKeyframesPair(keyframes, progress);
   let localProgress = prevKf === nextKf ? 0 : remap(progress, (_a = prevKf.t) != null ? _a : 0, (_b = nextKf.t) != null ? _b : 0, 0, 1);
@@ -3349,7 +3572,7 @@ function liftBodyTranslate(node, transformBy) {
       if (split.rest) node.transform = split.rest;
       else delete node.transform;
     }
-  } else if (node.transform && typeof node.transform === "object" && !Array.isArray(node.transform) && !node.transform.keyframes && !node.transform.kfs) {
+  } else if (node.transform && typeof node.transform === "object" && !Array.isArray(node.transform) && !node.transform.keyframes) {
     const wrapped = node.transform.value;
     const isWrapped = !!(wrapped && typeof wrapped === "object");
     const value = isWrapped ? wrapped : node.transform;
@@ -3484,12 +3707,12 @@ function synthesiseGradientDef(fx, id, ctx) {
     id
   };
   if (fx.type === PxGradientType.linear) {
-    applyGeomVec(out, "x1", "y1", fx.p1);
-    applyGeomVec(out, "x2", "y2", fx.p2);
+    applyGeomVec(out, "x1", "y1", fx.start);
+    applyGeomVec(out, "x2", "y2", fx.end);
   } else {
-    applyGeomVec(out, "cx", "cy", fx.c);
-    applyGeomNumber(out, "r", fx.r);
-    applyGeomVec(out, "fx", "fy", fx.fp);
+    applyGeomVec(out, "cx", "cy", fx.center);
+    applyGeomNumber(out, "r", fx.radius);
+    applyGeomVec(out, "fx", "fy", fx.focal);
   }
   if (fx.gradientUnits) out.gradientUnits = fx.gradientUnits;
   if (fx.spreadMethod) out.spreadMethod = fx.spreadMethod;
@@ -3617,8 +3840,7 @@ function formatOffset(o) {
 
 // src/effects/clipPathEffect.ts
 function applyClipPathEffect(node, fx, ctx) {
-  var _a, _b;
-  if (!fx || !fx.d && !fx.animate) return node;
+  if (!(fx == null ? void 0 : fx.d)) return node;
   const clipId = genId(ctx, "clip");
   const pathChild = { type: "path" };
   const read = readAnimatable(fx.d);
@@ -3630,11 +3852,6 @@ function applyClipPathEffect(node, fx, ctx) {
       if (pathChild.d !== void 0) pathChild.d = pathString(pathChild.d);
     }
   }
-  if (fx.animate && !((_a = pathChild.animate) == null ? void 0 : _a.d)) {
-    const animate = (_b = pathChild.animate) != null ? _b : {};
-    animate.d = fx.animate;
-    pathChild.animate = animate;
-  }
   ctx.defs.push({ type: "clipPath", id: clipId, children: [pathChild] });
   node.clipPath = "url(#" + clipId + ")";
   return node;
@@ -3779,7 +3996,7 @@ function readTransformationFromBody(node) {
     if (parts.origin) out.origin = parts.origin;
     return Object.keys(out).length ? out : void 0;
   }
-  if (node.transform && typeof node.transform === "object" && !node.transform.keyframes && !node.transform.kfs) {
+  if (node.transform && typeof node.transform === "object" && !node.transform.keyframes) {
     const wrapped = node.transform.value;
     const value = wrapped && typeof wrapped === "object" ? wrapped : node.transform;
     if (value && typeof value === "object") {
@@ -5135,10 +5352,10 @@ function applyTextGlyphsAlongPath(node, ctx, pathD, startOffset, textLength, pat
   return materialiseGlyphTextAlongPath(node, pathD, startOffset, { glyphs: ctx.glyphs, warnings: ctx.warnings }, textLength, pathOverflow);
 }
 
-// src/effects/trimPathEffect.ts
-function applyTrimPathEffect(node, trimPath, ctx) {
-  if (!trimPath) return node;
-  const combined = trimPath.subPaths === PxTrimSubPaths.combined;
+// src/effects/strokeTrimEffect.ts
+function applyStrokeTrimEffect(node, strokeTrim, ctx) {
+  if (!strokeTrim) return node;
+  const combined = strokeTrim.subPaths === PxStrokeTrimSubPaths.combined;
   const leafEntries = [];
   const measure = (n) => {
     if (Array.isArray(n.children) && n.children.length > 0) {
@@ -5169,9 +5386,9 @@ function applyTrimPathEffect(node, trimPath, ctx) {
   }
   const chainLengthPx = acc;
   if (combined && chainLengthPx < 1e-3) return node;
-  const offsetReadRaw = readAnimatable(trimPath.offset);
+  const offsetReadRaw = readAnimatable(strokeTrim.offset);
   const offsetRead = offsetReadRaw.kind === "absent" /* Absent */ ? { kind: "static" /* Static */, value: 0 } : offsetReadRaw;
-  const rangeReadRaw = readRangeWithCrossings(trimPath.range);
+  const rangeReadRaw = readRangeWithCrossings(strokeTrim.range);
   const rangeRead = rangeReadRaw.kind === "absent" /* Absent */ ? { kind: "static" /* Static */, value: [0, 1] } : rangeReadRaw;
   const offsetValues = readScalarValues(offsetRead);
   const minOffset = offsetValues.length ? Math.min(...offsetValues) : 0;
@@ -5503,7 +5720,7 @@ function applyPlayerEffects_exceptRetime(node, ctx) {
   const originalId = typeof node.id === "string" ? node.id : void 0;
   const innerIdForContentRef = originalId ? ctx.contentRefInnerIds.get(originalId) : void 0;
   if (!fx && !innerIdForContentRef) return node;
-  const { transformBy, repeater, maskedBy, clipPath, trimPath, clone: cloneFx, fillGradient, strokeGradient, textPath, text } = fx != null ? fx : {};
+  const { transformBy, repeater, maskedBy, clipPath, strokeTrim, clone: cloneFx, fillGradient, strokeGradient, textPath, text } = fx != null ? fx : {};
   if (fx) delete node.effects;
   let n = node;
   let consumedByGlyphs = false;
@@ -5523,7 +5740,7 @@ function applyPlayerEffects_exceptRetime(node, ctx) {
   if (!consumedByGlyphs) n = applyTextPathEffect(n, textPath, ctx);
   n = applyFillGradientEffect(n, fillGradient, ctx);
   n = applyStrokeGradientEffect(n, strokeGradient, ctx);
-  n = applyTrimPathEffect(n, trimPath, ctx);
+  n = applyStrokeTrimEffect(n, strokeTrim, ctx);
   n = applyRepeaterEffect(n, repeater, ctx);
   n = applyMaskedByEffect(n, maskedBy, transformBy, ctx);
   n = applyClipPathEffect(n, clipPath, ctx);
@@ -5586,9 +5803,9 @@ var fmt2 = (n) => {
   return Object.is(r, -0) ? "0" : String(r);
 };
 function buildOffsetPath(propAnim) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   if (propAnim.alongPathMode !== "offsetPath") return void 0;
-  const kfs = (_a = propAnim.keyframes) != null ? _a : propAnim.kfs;
+  const kfs = propAnim.keyframes;
   if (!kfs || kfs.length < 2) return void 0;
   const first = kfValue(kfs[0]);
   const anchor = (first == null ? void 0 : first.origin) && first.origin.length >= 2 ? [first.origin[0], first.origin[1]] : [0, 0];
@@ -5599,7 +5816,7 @@ function buildOffsetPath(propAnim) {
     if (!tr || tr.length < 2) return void 0;
     const parts = Object.keys(v);
     if (parts.some((p) => p !== "translate" && p !== "origin")) return void 0;
-    const o = (_b = v == null ? void 0 : v.origin) != null ? _b : [0, 0];
+    const o = (_a = v == null ? void 0 : v.origin) != null ? _a : [0, 0];
     if (o[0] !== anchor[0] || o[1] !== anchor[1]) return void 0;
     points.push([tr[0] + anchor[0], tr[1] + anchor[1]]);
   }
@@ -5608,8 +5825,8 @@ function buildOffsetPath(propAnim) {
   const segLens = [];
   for (let i = 0; i < points.length - 1; i++) {
     const p0 = points[i], p1 = points[i + 1];
-    const to = (_c = kfTangentOut(kfs[i])) != null ? _c : [0, 0];
-    const ti = (_d = kfTangentIn(kfs[i + 1])) != null ? _d : [0, 0];
+    const to = (_b = kfTangentOut(kfs[i])) != null ? _b : [0, 0];
+    const ti = (_c = kfTangentIn(kfs[i + 1])) != null ? _c : [0, 0];
     const c1 = [p0[0] + to[0], p0[1] + to[1]];
     const c2 = [p1[0] + ti[0], p1[1] + ti[1]];
     d += "C" + fmt2(c1[0]) + "," + fmt2(c1[1]) + "," + fmt2(c2[0]) + "," + fmt2(c2[1]) + "," + fmt2(p1[0]) + "," + fmt2(p1[1]);
@@ -6247,15 +6464,17 @@ function subtractMultiset(a, b) {
   PxScrollRangeSchema,
   PxScrollSchema,
   PxStrokeGradientEffectSchema,
+  PxStrokeTrimEffectSchema,
+  PxStrokeTrimSubPaths,
   PxSvgNodeExtra,
   PxTextEffectSchema,
   PxTextPathEffectSchema,
+  PxTimelinePinSchema,
+  PxTimelineSchema,
   PxTransformByEffectSchema,
   PxTransformPartsSchema,
   PxTransformValueSchema,
   PxTriggerSchema,
-  PxTrimPathEffectSchema,
-  PxTrimSubPaths,
   STYLE_ATTR_NAMES,
   TEXT_ATTR,
   TEXT_CONTENT_ATTR,
@@ -6275,6 +6494,7 @@ function subtractMultiset(a, b) {
   diffInEffect,
   evaluateMotionPathSegment,
   extendedPathForBrowser,
+  flattenAnimatorTimeline,
   generateNewIds,
   generateUniqueId,
   getAnimatorConfig,
@@ -6300,6 +6520,9 @@ function subtractMultiset(a, b) {
   materialiseInternalLoopsInTree,
   materialiseMotionPathInPropAnim,
   materialiseMotionPathsInTree,
+  mergeStaticTransformIntoAnimDef,
+  nestAnimatorTimeline,
+  parseTransformParts,
   propAnimIsMotionPath,
   px,
   resolveStyle,