@pixodesk/svg-animator-web 1.0.34 → 1.0.39

package/dist/pixodesk-svg-animator.umd.js

@@ -51,21 +51,21 @@ var PixodeskAnimator = (() => {
   // src/index.player.ts
   var index_player_exports = {};
   __export(index_player_exports, {
-    PX_ANIMATOR_DATA_KEY: () => PX_ANIMATOR_DATA_KEY,
+    PX_ANIMATOR_DOC_KEY: () => PX_ANIMATOR_DOC_KEY,
     PX_ANIM_ATTR_NAME: () => PX_ANIM_ATTR_NAME,
     PX_ANIM_SRC_ATTR_NAME: () => PX_ANIM_SRC_ATTR_NAME,
-    PxAnimatorEngine: () => PxAnimatorEngine,
-    PxAnimatorMode: () => PxAnimatorMode,
+    PxTimelineEngine: () => PxTimelineEngine,
+    PxTimelineEngineExtra: () => PxTimelineEngineExtra,
     createAnimator: () => createAnimator,
-    createAnimatorImpl: () => createAnimatorImpl,
     generateNewIds: () => generateNewIds,
     loadTagAnimators: () => loadTagAnimators,
-    setupAnimationTriggers: () => setupAnimationTriggers
+    setupAnimationTriggers: () => setupAnimationTriggers,
+    validateDocument: () => validateDocument
   });
 
-  // ../svg-animator-core/src/PxAnimatorUtil.ts
+  // ../svg-animator-core/src/util/PxAnimatorUtil.ts
   function bezierToSvgPath(path, forceCurves = false) {
-    var _a, _b, _c, _d;
+    var _a2, _b, _c, _d;
     const v = path.v;
     const i = path.i;
     const o = path.o;
@@ -76,7 +76,7 @@ var PixodeskAnimator = (() => {
     d.push("M" + v[0][0] + "," + v[0][1]);
     for (let idx = 1; idx < len; idx++) {
       const prevV = v[idx - 1];
-      const prevO = (_a = o == null ? void 0 : o[idx - 1]) != null ? _a : prevV;
+      const prevO = (_a2 = o == null ? void 0 : o[idx - 1]) != null ? _a2 : prevV;
       const currI = (_b = i == null ? void 0 : i[idx]) != null ? _b : v[idx];
       const currV = v[idx];
       const isLine = !forceCurves && (prevO[0] === prevV[0] && prevO[1] === prevV[1]) && (currI[0] === currV[0] && currI[1] === currV[1]);
@@ -127,7 +127,7 @@ var PixodeskAnimator = (() => {
     return res;
   }
   function interpolateBezier(path1, path2, progress) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
     if (!path1 || !path2) return path1 || path2 || { v: [] };
     const t = Math.min(Math.max(progress, 0), 1);
     const len = Math.min(path1.v.length, path2.v.length);
@@ -138,7 +138,7 @@ var PixodeskAnimator = (() => {
       const v1 = path1.v[idx];
       const v2 = path2.v[idx];
       v.push(interpolateVec(v1, v2, t));
-      const i1 = (_b = (_a = path1.i) == null ? void 0 : _a[idx]) != null ? _b : v1;
+      const i1 = (_b = (_a2 = path1.i) == null ? void 0 : _a2[idx]) != null ? _b : v1;
       const i2 = (_d = (_c = path2.i) == null ? void 0 : _c[idx]) != null ? _d : v2;
       i.push(interpolateVec(i1, i2, t));
       const o1 = (_f = (_e = path1.o) == null ? void 0 : _e[idx]) != null ? _f : v1;
@@ -257,8 +257,8 @@ var PixodeskAnimator = (() => {
     return color.length === 4 ? "rgba(" + r + "," + g + "," + b + "," + color[3] + ")" : "rgb(" + r + "," + g + "," + b + ")";
   }
   function parseRgba(s) {
-    var _a;
-    const inner = (_a = s.match(/rgba?\((.*)\)/)) == null ? void 0 : _a[1];
+    var _a2;
+    const inner = (_a2 = s.match(/rgba?\((.*)\)/)) == null ? void 0 : _a2[1];
     if (!inner) throw new Error("Invalid rgb/rgba format");
     const parts = inner.split(",").map((v) => +v.trim());
     return [parts[0] / 255, parts[1] / 255, parts[2] / 255, ...parts[3] !== void 0 ? [parts[3]] : []];
@@ -293,13 +293,13 @@ var PixodeskAnimator = (() => {
     }
     return void 0;
   }
-  var COLOUR_ATTR_NAMES = /* @__PURE__ */ new Set(["color", "fill", "flood-color", "lighting-color", "stop-color", "stroke"]);
+  var COLOR_ATTR_NAMES = /* @__PURE__ */ new Set(["color", "fill", "flood-color", "lighting-color", "stop-color", "stroke"]);
   var TRANSFORM_FN_NAMES = /* @__PURE__ */ new Set(["translate", "rotate", "scale", "skew"]);
   var PCT_BASED_ATTR_NAMES = /* @__PURE__ */ new Set(["offset-distance", "offsetDistance"]);
   function composeTransformParts(parts, opts) {
-    var _a;
+    var _a2;
     if (!parts) return "";
-    const withUnits = (_a = opts == null ? void 0 : opts.withUnits) != null ? _a : true;
+    const withUnits = (_a2 = opts == null ? void 0 : opts.withUnits) != null ? _a2 : true;
     const segs = [];
     const t = parts.translate;
     const o = parts.origin;
@@ -317,7 +317,7 @@ var PixodeskAnimator = (() => {
     return segs.join("");
   }
   function parseTransformParts(str2) {
-    var _a, _b;
+    var _a2, _b;
     if (!str2 || typeof str2 !== "string") return void 0;
     const out = {};
     const re = /([a-zA-Z]+)\s*\(([^)]*)\)/g;
@@ -333,7 +333,7 @@ var PixodeskAnimator = (() => {
       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];
+        out.translate = [nums[0], (_a2 = nums[1]) != null ? _a2 : 0];
       } else if (fn === "rotate") {
         if (nums.length !== 1) return void 0;
         out.rotate = nums[0];
@@ -511,7 +511,7 @@ var PixodeskAnimator = (() => {
     return cubicBezier(flipped);
   }
 
-  // ../svg-animator-core/src/PxScrollMath.ts
+  // ../svg-animator-core/src/playback/PxScrollMath.ts
   function isScrollTimeline(config) {
     return (config == null ? void 0 : config.timelineSource) === "scroll";
   }
@@ -539,8 +539,8 @@ var PixodeskAnimator = (() => {
   }
   var DEFAULT_PHASE = "cover";
   function resolveRangePointU(point, defaultFraction, subjectSize, scrollportSize) {
-    var _a;
-    const [u0, u1] = scrollPhaseInterval((_a = point == null ? void 0 : point.phase) != null ? _a : DEFAULT_PHASE, subjectSize, scrollportSize);
+    var _a2;
+    const [u0, u1] = scrollPhaseInterval((_a2 = point == null ? void 0 : point.phase) != null ? _a2 : DEFAULT_PHASE, subjectSize, scrollportSize);
     const fraction = typeof (point == null ? void 0 : point.fraction) === "number" ? point.fraction : defaultFraction;
     return u0 + fraction * (u1 - u0);
   }
@@ -552,9 +552,9 @@ var PixodeskAnimator = (() => {
     return clamp((u - uStart) / (uEnd - uStart), 0, 1);
   }
   function scrollOffsetProgress(offset, maxOffset, range) {
-    var _a, _b;
+    var _a2, _b;
     const raw = maxOffset > 0 ? clamp(offset / maxOffset, 0, 1) : 1;
-    const start = typeof ((_a = range == null ? void 0 : range.start) == null ? void 0 : _a.fraction) === "number" ? range.start.fraction : 0;
+    const start = typeof ((_a2 = range == null ? void 0 : range.start) == null ? void 0 : _a2.fraction) === "number" ? range.start.fraction : 0;
     const end = typeof ((_b = range == null ? void 0 : range.end) == null ? void 0 : _b.fraction) === "number" ? range.end.fraction : 1;
     if (end <= start) return raw >= end ? 1 : 0;
     return clamp((raw - start) / (end - start), 0, 1);
@@ -567,7 +567,8 @@ var PixodeskAnimator = (() => {
     return vertical ? "x" : "y";
   }
 
-  // ../svg-animator-core/src/PxSchema.ts
+  // ../svg-animator-core/src/schema/PxSchema.ts
+  var PX_UNKNOWN_KEY_ERROR = "unexpected extra key";
   function pathStr(path) {
     if (!path.length) return ".";
     let result = "";
@@ -675,6 +676,7 @@ var PixodeskAnimator = (() => {
       return false;
     }
   };
+  var UNION_MEMBER_ERROR_LIMIT = 4;
   var Union = class extends Base {
     constructor(schemas, defaultVal) {
       super();
@@ -690,10 +692,38 @@ var PixodeskAnimator = (() => {
       return this._default;
     }
     isValid(raw, ctx, path) {
-      var _a;
+      var _a2;
       const probe = ctx && { errors: [], warnings: [], strict: ctx.strict };
       if (this.schemas.some((s) => s.isValid(raw, probe, path ? [...path] : void 0))) return true;
-      ctx == null ? void 0 : ctx.errors.push(pathStr(path != null ? path : []) + ": no union member matched for value " + ((_a = JSON.stringify(raw)) != null ? _a : "").slice(0, 240));
+      if (!ctx) return false;
+      const base = pathStr(path != null ? path : []);
+      ctx.errors.push(base + ": no union member matched for value " + ((_a2 = JSON.stringify(raw)) != null ? _a2 : "").slice(0, 240));
+      let best;
+      let bestDepth = -1;
+      const leafExpectations = [];
+      for (const member of this.schemas) {
+        const sink = { errors: [], warnings: [], strict: ctx.strict };
+        member.isValid(raw, sink, path ? [...path] : void 0);
+        if (!sink.errors.length) continue;
+        const depth = Math.max(...sink.errors.map((e) => e.slice(0, e.indexOf(":")).length));
+        if (depth > bestDepth || depth === bestDepth && best && sink.errors.length < best.length) {
+          bestDepth = depth;
+          best = sink.errors;
+        }
+        if (depth <= base.length) {
+          for (const e of sink.errors) {
+            const m = /: expected (.+?), got /.exec(e);
+            if (m && !leafExpectations.includes(m[1])) leafExpectations.push(m[1]);
+          }
+        }
+      }
+      if (best && bestDepth > base.length) {
+        for (const e of best.slice(0, UNION_MEMBER_ERROR_LIMIT)) {
+          if (!ctx.errors.includes(e)) ctx.errors.push(e);
+        }
+      } else if (leafExpectations.length) {
+        ctx.errors.push(base + ": expected " + leafExpectations.join(" | "));
+      }
       return false;
     }
     _canSanitize(raw) {
@@ -702,6 +732,7 @@ var PixodeskAnimator = (() => {
   };
   var DiscriminatedUnion = class extends Base {
     constructor(_key, _schemas, defaultVal) {
+      var _a2;
       super();
       this._key = _key;
       this._schemas = _schemas;
@@ -711,18 +742,21 @@ var PixodeskAnimator = (() => {
       this._map = /* @__PURE__ */ new Map();
       for (const s of _schemas) {
         const keySchema = s._shape[_key];
-        if (keySchema) this._map.set(keySchema._default, s);
+        if (!keySchema) continue;
+        const literal = (_a2 = keySchema.inner) != null ? _a2 : keySchema;
+        this._map.set(literal._default, s);
+        if (keySchema.inner) this._absentMember = s;
       }
     }
     _findSchema(raw) {
       if (raw === null || typeof raw !== "object" || Array.isArray(raw)) return void 0;
       const val = raw[this._key];
-      if (val === void 0 || val === null) return void 0;
+      if (val === void 0 || val === null) return this._absentMember;
       return this._map.get(val);
     }
     sanitize(raw) {
-      var _a;
-      return ((_a = this._findSchema(raw)) != null ? _a : this._schemas[0]).sanitize(raw);
+      var _a2;
+      return ((_a2 = this._findSchema(raw)) != null ? _a2 : this._schemas[0]).sanitize(raw);
     }
     isValid(raw, ctx, path) {
       const schema = this._findSchema(raw);
@@ -751,7 +785,8 @@ var PixodeskAnimator = (() => {
       const src = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
       const out = {};
       for (const key of Object.keys(this._shape)) {
-        out[key] = this._shape[key].sanitize(src[key]);
+        const v = this._shape[key].sanitize(src[key]);
+        if (v !== void 0) out[key] = v;
       }
       return out;
     }
@@ -773,7 +808,7 @@ var PixodeskAnimator = (() => {
           if (key in this._shape) continue;
           if (obj[key] === void 0) continue;
           p.push(key);
-          ctx.errors.push(pathStr(p) + ": unexpected extra key");
+          ctx.errors.push(pathStr(p) + ": " + PX_UNKNOWN_KEY_ERROR);
           p.pop();
           ok = false;
         }
@@ -797,7 +832,8 @@ var PixodeskAnimator = (() => {
       const src = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
       const out = __spreadValues({}, src);
       for (const key of Object.keys(this._shape)) {
-        out[key] = this._shape[key].sanitize(src[key]);
+        const v = this._shape[key].sanitize(src[key]);
+        if (v !== void 0) out[key] = v;
       }
       if (this._openSchema) {
         for (const key of Object.keys(src)) {
@@ -939,8 +975,8 @@ var PixodeskAnimator = (() => {
       this.resolved = null;
     }
     get schema() {
-      var _a;
-      return (_a = this.resolved) != null ? _a : this.resolved = this.fn();
+      var _a2;
+      return (_a2 = this.resolved) != null ? _a2 : this.resolved = this.fn();
     }
     sanitize(raw) {
       return this.schema.sanitize(raw);
@@ -1038,25 +1074,135 @@ var PixodeskAnimator = (() => {
     lazy: (fn, defaultVal) => new Lazy(fn, defaultVal)
   };
 
-  // ../svg-animator-core/src/PxAnimatorConstants.ts
+  // ../svg-animator-core/src/version/PxSchemaVersion.ts
+  var PX_PLAYER_SCHEMA_VERSION = "1.1";
+
+  // ../svg-animator-core/src/version/PxWireVersion.ts
+  var VERSION_RE = /^(\d+)\.(\d+)(?:\.(\d+))?$/;
+  function parseWireVersion(raw) {
+    if (typeof raw !== "string") return void 0;
+    const m = VERSION_RE.exec(raw.trim());
+    if (!m) return void 0;
+    return { a: Number(m[1]), b: Number(m[2]), c: m[3] === void 0 ? 0 : Number(m[3]) };
+  }
+  var _a;
+  var PLAYER_WIRE_VERSION = (_a = parseWireVersion(PX_PLAYER_SCHEMA_VERSION)) != null ? _a : { a: 1, b: 1, c: 0 };
+
+  // ../svg-animator-core/src/format/PxAnimatorConstants.ts
+  var PxFillMode = {
+    forwards: "forwards",
+    backwards: "backwards",
+    both: "both",
+    none: "none"
+  };
+  var PxPlaybackDirection = {
+    normal: "normal",
+    reverse: "reverse",
+    alternate: "alternate",
+    alternateReverse: "alternate-reverse"
+  };
   var PX_ANIM_SRC_ATTR_NAME = "data-px-animation-src";
   var PX_ANIM_ATTR_NAME = "_px_animator";
-  var PxAnimatorMode = {
-    auto: "auto",
-    waapi: "waapi",
-    frames: "frames"
+  var PxStartOn = {
+    load: "load",
+    mouseOver: "mouseOver",
+    click: "click",
+    scrollIntoView: "scrollIntoView",
+    programmatic: "programmatic"
   };
-  var PxAnimatorEngine = {
-    waapi: PxAnimatorMode.waapi,
-    frames: PxAnimatorMode.frames
+  var PxOutAction = {
+    continue: "continue",
+    pause: "pause",
+    reset: "reset",
+    reverse: "reverse"
   };
-  var PxLoopExtend = {
-    /** Segment from the START; the animation is extended BEFORE the first keyframe
-     *  (intro loops that run before the main timeline begins). */
-    before: "before",
-    /** DEFAULT — segment from the END; extended AFTER the last keyframe (idle/outro
-     *  loops that continue once the main timeline has finished). */
-    after: "after"
+  var PxFinishAction = {
+    hold: "hold",
+    reset: "reset"
+  };
+  var PxScrollKind = {
+    view: "view",
+    scroll: "scroll"
+  };
+  var PxScrollAxis = {
+    block: "block",
+    inline: "inline",
+    x: "x",
+    y: "y"
+  };
+  var PxScrollSource = {
+    nearest: "nearest",
+    root: "root"
+  };
+  var PxPinAlign = {
+    top: "top",
+    center: "center",
+    bottom: "bottom"
+  };
+  var PxScrollPhase = {
+    cover: "cover",
+    contain: "contain",
+    entry: "entry",
+    exit: "exit",
+    entryCrossing: "entry-crossing",
+    exitCrossing: "exit-crossing"
+  };
+  var PxAlongPathMode = {
+    sampled: "sampled",
+    offsetPath: "offsetPath"
+  };
+  var PX_TIMELINE_SHARED_KEYS = ["duration", "iterations", "engine", "frameRate"];
+  var PX_TIME_ONLY_TIMELINE_KEYS = ["trigger", "delay", "fillMode", "direction"];
+  var PX_FLAT_RUNTIME_VIEW_KEYS = [
+    ...PX_TIMELINE_SHARED_KEYS,
+    ...PX_TIME_ONLY_TIMELINE_KEYS,
+    "fill",
+    "resetOnFinish",
+    "timelineSource",
+    "scroll"
+  ];
+  var PxTimelineEngine = {
+    native: "native",
+    js: "js"
+  };
+  var PxTimelineEngineExtra = __spreadProps(__spreadValues({}, PxTimelineEngine), {
+    auto: "auto"
+  });
+  function resolveTimelineEngine(engine) {
+    return engine === PxTimelineEngineExtra.js ? PxTimelineEngine.js : PxTimelineEngine.native;
+  }
+  function isNativeForced(engine) {
+    return engine === PxTimelineEngineExtra.native;
+  }
+  function mayUseNativeScrollTimeline(engine) {
+    return engine !== PxTimelineEngineExtra.js;
+  }
+  var PX_TRIGGER_DEFAULTS = {
+    startOn: "load",
+    outAction: "continue",
+    scrollIntoViewThreshold: 0
+  };
+  function resolveTrigger(trigger) {
+    var _a2, _b, _c;
+    return {
+      startOn: (_a2 = trigger == null ? void 0 : trigger.startOn) != null ? _a2 : PX_TRIGGER_DEFAULTS.startOn,
+      outAction: (_b = trigger == null ? void 0 : trigger.outAction) != null ? _b : PX_TRIGGER_DEFAULTS.outAction,
+      scrollIntoViewThreshold: (_c = trigger == null ? void 0 : trigger.scrollIntoViewThreshold) != null ? _c : PX_TRIGGER_DEFAULTS.scrollIntoViewThreshold
+    };
+  }
+  var PxLoopRepeatAt = {
+    /** Segment from the START; the repetition runs BEFORE the first keyframe
+     *  (intro loops that play until the main timeline begins). */
+    start: "start",
+    /** DEFAULT — segment from the END; the repetition runs AFTER the last keyframe
+     *  (idle/outro loops that continue once the main timeline has finished). */
+    end: "end"
+  };
+  var PxLoopDirection = {
+    /** DEFAULT — cycle: every repetition replays the segment the same way round. */
+    normal: "normal",
+    /** Ping-pong: repetitions alternate forward / backward. */
+    alternate: "alternate"
   };
   var PxMaskType = {
     luminance: "luminance",
@@ -1066,8 +1212,9 @@ var PixodeskAnimator = (() => {
     userSpaceOnUse: "userSpaceOnUse",
     objectBoundingBox: "objectBoundingBox"
   };
-  var PxCloneType = {
-    content: "content"
+  var PxCloneWithout = {
+    translate: "translate"
+    // transform: 'transform',   // future: drop rotate/scale too (content only)
   };
   var PxPathOverflow = {
     clip: "clip",
@@ -1089,8 +1236,10 @@ var PixodeskAnimator = (() => {
     separate: "separate",
     combined: "combined"
   };
-  var TEXT_ATTR = "text";
   var TEXT_CONTENT_ATTR = "textContent";
+  var CLASS_ATTR = "class";
+  var TRANSFORM_ATTR = "transform";
+  var OFFSET_DISTANCE_ATTR = "offsetDistance";
   var INTERNAL_ATTRS = /* @__PURE__ */ new Set([
     "type",
     "children",
@@ -1098,13 +1247,20 @@ var PixodeskAnimator = (() => {
     "meta",
     "animate",
     "effects",
-    TEXT_ATTR,
     TEXT_CONTENT_ATTR
   ]);
-  var PxGradientUnits = {
-    userSpaceOnUse: "userSpaceOnUse",
-    objectBoundingBox: "objectBoundingBox"
+  var TRANSFORM_PART = {
+    translate: "translate",
+    rotate: "rotate",
+    scale: "scale",
+    origin: "origin"
   };
+  var PX_TRANSFORM_PART_KEYS = [
+    TRANSFORM_PART.translate,
+    TRANSFORM_PART.rotate,
+    TRANSFORM_PART.scale,
+    TRANSFORM_PART.origin
+  ];
   var PxGradientSpreadMethod = {
     pad: "pad",
     reflect: "reflect",
@@ -1118,27 +1274,38 @@ var PixodeskAnimator = (() => {
     if (!(fileJson && typeof fileJson === "object" && !Array.isArray(fileJson))) {
       return false;
     }
-    return fileJson["type"] === "svg";
+    return fileJson.type === "svg";
   }
   function getAnimatorConfig(doc) {
-    var _a;
-    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 _a2;
+    const cfg = (doc == null ? void 0 : doc.animator) || ((_a2 = doc == null ? void 0 : doc.meta) == null ? void 0 : _a2.animator);
+    if (!cfg) return void 0;
+    const memoised = wireViewMemo.get(cfg);
+    if (memoised) return memoised;
+    const wire = cfg;
+    const stray = PX_FLAT_RUNTIME_VIEW_KEYS.filter((k) => wire[k] !== void 0);
+    const source = stray.length ? __spreadValues({}, wire) : cfg;
+    for (const k of stray) delete source[k];
+    const view = flattenAnimatorTimeline(source);
+    wireViewMemo.set(cfg, view);
+    return view;
+  }
+  var wireViewMemo = /* @__PURE__ */ new WeakMap();
   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"]);
+    const _a2 = cfg, { timeline: _dropped } = _a2, flat = __objRest(_a2, ["timeline"]);
+    if (timeline.engine !== void 0) flat.engine = timeline.engine;
+    if (timeline.frameRate !== void 0) flat.frameRate = timeline.frameRate;
     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;
@@ -1149,39 +1316,39 @@ var PixodeskAnimator = (() => {
       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.offset !== void 0) scroll.pinOffset = pin.offset;
         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"]);
+        const _b = timeline.trigger, { finishAction } = _b, restTrigger = __objRest(_b, ["finishAction"]);
         if (Object.keys(restTrigger).length) flat.trigger = restTrigger;
-        if (onFinish !== void 0) flat.resetOnFinish = onFinish === "reset";
+        if (finishAction !== void 0) flat.resetOnFinish = finishAction === "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;
+      if (timeline.fillMode !== void 0) flat.fill = timeline.fillMode;
     }
     flattenMemo.set(cfg, flat);
     return flat;
   }
   function getDefs(doc) {
-    var _a;
+    var _a2;
     if (!doc) return void 0;
-    return (_a = getAnimatorConfig(doc)) == null ? void 0 : _a.definitions;
+    return (_a2 = getAnimatorConfig(doc)) == null ? void 0 : _a2.definitions;
   }
   function getBindings(doc) {
-    var _a;
+    var _a2;
     if (!doc) return void 0;
-    const animateById = (_a = getAnimatorConfig(doc)) == null ? void 0 : _a.animateById;
+    const animateById = (_a2 = getAnimatorConfig(doc)) == null ? void 0 : _a2.animateById;
     if (!animateById) return void 0;
     return Object.entries(animateById).map(([id, anim]) => ({ id: id.startsWith("#") ? id.slice(1) : id, animate: anim }));
   }
 
-  // ../svg-animator-core/src/PxAnimatorTypes.ts
+  // ../svg-animator-core/src/format/PxAnimatorTypes.ts
   var PxEasingOrRefSchema = px.union([
     px.string(),
     px.tuple([px.number(), px.number(), px.number(), px.number()])
@@ -1191,14 +1358,13 @@ var PixodeskAnimator = (() => {
     // e.g. for colors
     px.number(),
     px.array(px.number()),
-    // ORDER LAW: the key-discriminated object shapes (`{path}`, `{paths}`) come BEFORE the
+    // ORDER LAW: the key-discriminated object shape (`{pathData}`) comes 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 `{}` —
+    // Union.sanitize route `{pathData}` 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: [] }),
+    px.object({ pathData: px.string() }),
     // Gradient `stops` timeline — each kf value is the full stops-array snapshot.
     px.lazy(() => px.array(PxGradientStopSchema), []),
     px.lazy(() => PxTransformPartsSchema, {})
@@ -1213,16 +1379,32 @@ var PixodeskAnimator = (() => {
     // (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 anyKf = (kf) => kf;
+  var kfTime = (kf) => {
+    var _a2, _b;
+    return (_b = (_a2 = anyKf(kf).time) != null ? _a2 : anyKf(kf).t) != null ? _b : 0;
+  };
+  var kfValue = (kf) => {
+    var _a2;
+    return (_a2 = anyKf(kf).value) != null ? _a2 : anyKf(kf).v;
+  };
+  var kfEasing = (kf) => {
+    var _a2;
+    return (_a2 = anyKf(kf).easing) != null ? _a2 : anyKf(kf).e;
+  };
+  var kfTangentIn = (kf) => anyKf(kf).tangentIn;
+  var kfTangentOut = (kf) => anyKf(kf).tangentOut;
   var PxLoopSchema = implementsInterface()(px.object({
     segmentCount: px.number().optional(),
-    extend: px.enum([PxLoopExtend.before, PxLoopExtend.after]).optional(),
-    alternate: px.boolean().optional()
+    repeatAt: px.enum([PxLoopRepeatAt.start, PxLoopRepeatAt.end]).optional(),
+    direction: px.enum([PxLoopDirection.normal, PxLoopDirection.alternate]).optional()
   }));
   var PxPropertyAnimationSchema = implementsInterface()(px.object({
     value: PxKeyframeValueSchema.optional(),
     keyframes: px.array(PxKeyframeSchema).optional(),
     loop: px.union([PxLoopSchema, px.boolean()]).optional(),
-    autoOrient: px.boolean().optional()
+    autoOrient: px.boolean().optional(),
+    alongPathMode: px.enum([PxAlongPathMode.sampled, PxAlongPathMode.offsetPath]).optional()
   }));
   var PxTransformPartsSchema = implementsInterface()(px.object({
     translate: px.tuple([px.number(), px.number()]).optional(),
@@ -1246,18 +1428,17 @@ var PixodeskAnimator = (() => {
     PxAnimationDefinitionSchema
   ]));
   var PxTriggerSchema = implementsInterface()(px.object({
-    startOn: px.enum(["load", "mouseOver", "click", "scrollIntoView", "programmatic"]).optional(),
-    outAction: px.enum(["continue", "pause", "reset", "reverse"]).optional(),
+    startOn: px.enum([PxStartOn.load, PxStartOn.mouseOver, PxStartOn.click, PxStartOn.scrollIntoView, PxStartOn.programmatic], PX_TRIGGER_DEFAULTS.startOn).optional(),
+    outAction: px.enum([PxOutAction.continue, PxOutAction.pause, PxOutAction.reset, PxOutAction.reverse], PX_TRIGGER_DEFAULTS.outAction).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(),
+    // `fill`) or `'reset'` (snap back to the start state). Pairs with `outAction` ("what
+    // happens when the trigger condition ends"); both end-of-life knobs now read alike.
+    finishAction: px.enum([PxFinishAction.hold, PxFinishAction.reset]).optional(),
     scrollIntoViewThreshold: px.number().optional()
   }));
   var PxGlyphSchema = implementsInterface()(px.object({
     width: px.number(),
-    d: px.string()
+    pathData: px.string()
   }));
   var PxGlyphFontSchema = implementsInterface()(px.object({
     fontFamily: px.string(),
@@ -1272,11 +1453,17 @@ var PixodeskAnimator = (() => {
     // 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()
+    fonts: px.record(PxGlyphFontSchema).optional()
   }));
-  var PX_SCROLL_PHASES = ["cover", "contain", "entry", "exit", "entry-crossing", "exit-crossing"];
   var PxScrollRangePointSchema = implementsInterface()(px.object({
-    phase: px.enum(PX_SCROLL_PHASES).optional(),
+    phase: px.enum([
+      PxScrollPhase.cover,
+      PxScrollPhase.contain,
+      PxScrollPhase.entry,
+      PxScrollPhase.exit,
+      PxScrollPhase.entryCrossing,
+      PxScrollPhase.exitCrossing
+    ]).optional(),
     fraction: px.number().optional()
   }));
   var PxScrollRangeSchema = px.object({
@@ -1284,34 +1471,38 @@ var PixodeskAnimator = (() => {
     end: PxScrollRangePointSchema.optional()
   });
   var PxScrollSchema = implementsInterface()(px.object({
-    driver: px.enum(["custom", "native"]).optional(),
-    kind: px.enum(["view", "scroll"]).optional(),
-    axis: px.enum(["block", "inline", "x", "y"]).optional(),
-    source: px.enum(["nearest", "root"]).optional(),
+    kind: px.enum([PxScrollKind.view, PxScrollKind.scroll]).optional(),
+    axis: px.enum([PxScrollAxis.block, PxScrollAxis.inline, PxScrollAxis.x, PxScrollAxis.y]).optional(),
+    source: px.enum([PxScrollSource.nearest, PxScrollSource.root]).optional(),
     // Free-form: the two keywords `parent`/`scroller` plus any CSS selector.
     subject: px.string().optional(),
     smoothing: px.number().optional(),
     pin: px.boolean().optional(),
-    pinAlign: px.enum(["top", "center", "bottom"]).optional(),
-    pinTop: px.number().optional(),
+    pinAlign: px.enum([PxPinAlign.top, PxPinAlign.center, PxPinAlign.bottom]).optional(),
+    pinOffset: px.number().optional(),
     pinDistance: px.number().optional(),
     range: PxScrollRangeSchema.optional()
   }));
-  var PxTimelinePinSchema = px.object({
-    align: px.enum(["top", "center", "bottom"]).optional(),
-    top: px.number().optional(),
+  var PxTimelinePinSchema = implementsInterface()(px.object({
+    align: px.enum([PxPinAlign.top, PxPinAlign.center, PxPinAlign.bottom]).optional(),
+    offset: px.number().optional(),
     distance: px.number().optional()
-  });
-  var PxClockTimelineSchema = px.object({
-    type: px.literal("clock"),
+  }));
+  var PxTimelineEngineSchema = px.enum([PxTimelineEngineExtra.auto, PxTimelineEngineExtra.native, PxTimelineEngineExtra.js]).optional();
+  var PxTimeTimelineSchema = implementsInterface()(px.object({
+    type: px.literal("time").optional(),
+    engine: PxTimelineEngineSchema,
+    frameRate: px.number().optional(),
     // §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(),
     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()
-  });
+    // `fillMode` on the wire (CSS `animation-fill-mode`; the runtime view calls it `fill`)
+    // — never `fill`, which is paint everywhere else in the format.
+    fillMode: px.enum([PxFillMode.forwards, PxFillMode.backwards, PxFillMode.both, PxFillMode.none]).optional(),
+    direction: px.enum([PxPlaybackDirection.normal, PxPlaybackDirection.reverse, PxPlaybackDirection.alternate, PxPlaybackDirection.alternateReverse]).optional()
+  }));
   var scrollishTimelineShape = {
     // §2.8: duration is a property of the TIMELINE — under scrubbing it is the keyframe
     // span the scroll range maps onto.
@@ -1319,9 +1510,10 @@ var PixodeskAnimator = (() => {
     // 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(),
+    engine: PxTimelineEngineSchema,
+    frameRate: px.number().optional(),
+    axis: px.enum([PxScrollAxis.block, PxScrollAxis.inline, PxScrollAxis.x, PxScrollAxis.y]).optional(),
+    source: px.enum([PxScrollSource.nearest, PxScrollSource.root]).optional(),
     subject: px.string().optional(),
     // 'parent' | 'scroller' | any CSS selector
     smoothing: px.number().optional(),
@@ -1329,23 +1521,29 @@ var PixodeskAnimator = (() => {
     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 PxScrollTimelineSchema = implementsInterface()(
+    px.object(__spreadValues({ type: px.literal("scroll") }, scrollishTimelineShape))
+  );
+  var PxViewTimelineSchema = implementsInterface()(
+    px.object(__spreadValues({ type: px.literal("view") }, scrollishTimelineShape))
+  );
   var PxTimelineSchema = px.discriminatedUnion("type", [
-    PxClockTimelineSchema,
+    PxTimeTimelineSchema,
+    // first = the member an absent `type` selects
     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(),
+    // (`mode`, `duration` and `frameRate` live INSIDE `timeline` on the wire — §2.8; they exist
+    // at this level only on the runtime view, like the rest of the playback dynamics.)
     // THE spelling of "what advances progress" — clock / scroll / view (review §2.1).
     timeline: PxTimelineSchema.optional(),
     definitions: PxDefsSchema.optional(),
     animateById: px.record(PxElementAnimationSchema).optional(),
-    debugInstName: px.string().optional()
+    debugGlobalName: px.string().optional(),
+    // Declared HERE because this is a closed object: an undeclared key would be stripped by
+    // `sanitize` and flagged by strict validation on our own files.
+    version: px.string().optional()
   }));
   var PxBindingSchema = implementsInterface()(px.object({
     id: px.string(),
@@ -1394,7 +1592,7 @@ var PixodeskAnimator = (() => {
     origin: PxAnimatableVec2Schema.optional()
   }));
   var PxMaskedByEffectSchema = implementsInterface()(px.object({
-    sourceId: px.string().optional(),
+    source: px.string().optional(),
     maskType: px.enum([PxMaskType.luminance, PxMaskType.alpha]).optional(),
     maskUnits: px.enum([PxUnits.userSpaceOnUse, PxUnits.objectBoundingBox]).optional(),
     maskContentUnits: px.enum([PxUnits.userSpaceOnUse, PxUnits.objectBoundingBox]).optional(),
@@ -1404,7 +1602,7 @@ var PixodeskAnimator = (() => {
     height: px.number().optional()
   }));
   var PxClipPathEffectSchema = implementsInterface()(px.object({
-    d: PxAnimatableStringSchema.optional()
+    pathData: PxAnimatableStringSchema.optional()
   }));
   var PxStrokeTrimEffectSchema = implementsInterface()(px.object({
     offset: PxAnimatableNumberSchema.optional(),
@@ -1417,9 +1615,10 @@ var PixodeskAnimator = (() => {
     timeCrop: px.tuple([px.number(), px.number()]).optional()
   }));
   var PxCloneEffectSchema = implementsInterface()(px.object({
-    // Contextual kind — the `type` convention, see `PxNodeBase.type`.
-    type: px.enum([PxCloneType.content]).optional(),
-    sourceId: px.string().optional(),
+    // Subtractive on purpose: the `<use>` can only point at one wrapper layer of the
+    // source, so the choices form a ladder — 'translate' now, maybe 'transform' later.
+    without: px.enum([PxCloneWithout.translate]).optional(),
+    source: px.string().optional(),
     retime: PxRetimeEffectSchema.optional()
   }));
   var PxGradientStopSchema = implementsInterface()(px.object({
@@ -1440,13 +1639,13 @@ var PixodeskAnimator = (() => {
     radius: PxAnimatableNumberSchema.optional(),
     focal: PxAnimatableVec2Schema.optional(),
     stops: PxAnimatableGradientStopsSchema.optional(),
-    gradientUnits: px.enum([PxGradientUnits.userSpaceOnUse, PxGradientUnits.objectBoundingBox]).optional(),
+    gradientUnits: px.enum([PxUnits.userSpaceOnUse, PxUnits.objectBoundingBox]).optional(),
     spreadMethod: px.enum([PxGradientSpreadMethod.pad, PxGradientSpreadMethod.reflect, PxGradientSpreadMethod.repeat]).optional(),
     gradientTransform: px.string().optional()
   }));
   var PxStrokeGradientEffectSchema = PxFillGradientEffectSchema;
   var PxTextPathEffectSchema = implementsInterface()(px.object({
-    path: px.string(),
+    pathData: px.string(),
     pathOverflow: px.enum([PxPathOverflow.clip, PxPathOverflow.extend]).optional(),
     lengthAdjust: px.enum([PxLengthAdjust.spacing, PxLengthAdjust.spacingAndGlyphs]).optional(),
     method: px.enum([PxTextPathMethod.align, PxTextPathMethod.stretch]).optional(),
@@ -1486,20 +1685,100 @@ var PixodeskAnimator = (() => {
     walk(root, "root");
     return warnings;
   }
+  function validateGlyphFontRefs(root, fonts) {
+    if (!fonts || !Object.keys(fonts).length) return [];
+    const problems = [];
+    const walk = (node, path, inherited, inGlyphText) => {
+      var _a2, _b;
+      if (!node) return;
+      const own = typeof node.fontFamily === "string" ? node.fontFamily : void 0;
+      const family = own != null ? own : inherited;
+      const isGlyphText = inGlyphText || node.type === "text" && !!((_b = (_a2 = node.effects) == null ? void 0 : _a2.text) == null ? void 0 : _b.useGlyphs);
+      if (isGlyphText && own && !Object.prototype.hasOwnProperty.call(fonts, own)) {
+        const problem = path + ': glyph-mode text uses font-family "' + own + '", which has no entry in animator.definitions.fonts';
+        if (!problems.includes(problem)) problems.push(problem);
+      }
+      if (Array.isArray(node.children)) {
+        node.children.forEach((c, i) => walk(c, path + ".children[" + i + "]", family, isGlyphText));
+      }
+    };
+    walk(root, "root", void 0, false);
+    return problems;
+  }
+  function validateEasingRefs(root, easings) {
+    const problems = [];
+    const walk = (node, path) => {
+      if (Array.isArray(node)) {
+        node.forEach((item, i) => walk(item, path + "[" + i + "]"));
+        return;
+      }
+      if (!node || typeof node !== "object") return;
+      const easing = node.easing;
+      if (typeof easing === "string" && !(easings && Object.prototype.hasOwnProperty.call(easings, easing))) {
+        const problem = path + '.easing: "' + easing + '" names no entry in animator.definitions.easings \u2014 it will play linear';
+        if (!problems.includes(problem)) problems.push(problem);
+      }
+      for (const [key, value] of Object.entries(node)) {
+        if (key === "easing") continue;
+        if (value && typeof value === "object") walk(value, path + "." + key);
+      }
+    };
+    walk(root, "root");
+    return problems;
+  }
+  function validateVersionStamp(doc) {
+    var _a2;
+    const version = (_a2 = getAnimatorConfig(doc)) == null ? void 0 : _a2.version;
+    if (version === void 0) return [];
+    if (parseWireVersion(version) !== void 0) return [];
+    return ["root.animator.version: " + JSON.stringify(version) + ' is not a version stamp ("a.b" or "a.b.c") \u2014 it reads as unstamped'];
+  }
+  function validateDocument(doc, opts) {
+    var _a2;
+    const strict = (opts == null ? void 0 : opts.strict) !== false;
+    const ctx = { errors: [], warnings: [], strict };
+    const problems = PxAnimatedSvgDocumentSchema.isValid(doc, ctx, ["root"]) ? [] : [...ctx.errors];
+    if (doc && typeof doc === "object") {
+      for (const w of validateNodeEffects(doc, { strict })) {
+        if (!problems.includes(w)) problems.push(w);
+      }
+      const defs = (_a2 = getAnimatorConfig(doc)) == null ? void 0 : _a2.definitions;
+      for (const w of validateGlyphFontRefs(doc, defs == null ? void 0 : defs.fonts)) {
+        if (!problems.includes(w)) problems.push(w);
+      }
+      for (const w of validateEasingRefs(doc, defs == null ? void 0 : defs.easings)) {
+        if (!problems.includes(w)) problems.push(w);
+      }
+      for (const w of validateVersionStamp(doc)) {
+        if (!problems.includes(w)) problems.push(w);
+      }
+    }
+    return problems;
+  }
   var PxNodeBase = px.openObject({
     // CONVENTION (SCHEMA-DESIGN R1 / issues N4): `type` is the ONE word for "what
     // kind of thing is this", discriminated by its CARRIER — here the node TAG
-    // (`rect`, `text`), and inside a sub-object that object's kind (`clone.type`,
+    // (`rect`, `text`), and inside a sub-object that object's kind (`fillGradient.type`,
     // `fillGradient.type`, editor `preset.type`). Each sits in its own object, so
     // the carrier disambiguates completely; synonyms (`cloneKind`, `presetShape`)
     // would add words that all mean "type" and still need the carrier to read.
     // Guarding a `type` SLOT against a wrong VALUE is the job of strict enums
     // (issues V3), never of distinct key names.
     type: px.string(),
+    // The escape hatch for elements that carry a REAL `type` attribute — `<feTurbulence
+    // type="fractalNoise">`, `<feFuncR type="table">`, `<feColorMatrix type="saturate">`.
+    // `type` is taken by the tag name, so the attribute travels here and the renderer puts
+    // it back (`PxAnimatorDOM.renderNode`, `PxRnRender`). Declared here — not merely
+    // documented — because a wire key that is not in a schema is invisible to the
+    // minifier's reserve list and gets renamed (MINIFICATION-BOUNDARY-PLAN.md §1.1).
+    domType: px.string().optional(),
+    // Text content of a `<text>` / `<tspan>`. Declared, so a non-string value is a schema error
+    // and the minifier reserves the key; `text` is NOT an alias for it and is not read anywhere.
+    textContent: px.string().optional(),
     id: px.string().optional(),
     meta: px.any().optional(),
     // Player-effects bucket emitted by the Editor's lightweight design format.
-    // Consumed and removed by `applyPlayerEffects` before any other normalisation
+    // Consumed and removed by `applyPlayerEffects` before any other normalization
     // (see `createAnimatorImpl`), so downstream code never sees it.
     effects: PxEffectsSchema.optional(),
     // `PxElementAnimation` (not just `PxAnimationDefinition`) — accepts
@@ -1531,7 +1810,7 @@ var PixodeskAnimator = (() => {
     c: px.boolean().optional()
   }));
 
-  // ../svg-animator-core/src/PxIdUtil.ts
+  // ../svg-animator-core/src/util/PxIdUtil.ts
   var _idCounter = 0;
   function generateUniqueId() {
     const timestamp = Date.now().toString(36);
@@ -1550,7 +1829,7 @@ var PixodeskAnimator = (() => {
     return cloned;
   }
   function generateNewIds(doc) {
-    var _a, _b;
+    var _a2, _b;
     const cloned = deepClone(doc);
     const idMap = /* @__PURE__ */ new Map();
     const hashRefAttrs = /* @__PURE__ */ new Set(["href", "xlink:href"]);
@@ -1568,7 +1847,8 @@ var PixodeskAnimator = (() => {
       "flood-color",
       "lighting-color"
     ]);
-    const directIdRefAttrs = /* @__PURE__ */ new Set(["sourceId", "targetId", "boundElementId"]);
+    const directIdRefAttrs = /* @__PURE__ */ new Set(["targetId", "boundElementId"]);
+    const isEffectSourceRef = (key, parentKey) => key === "source" && (parentKey === "maskedBy" || parentKey === "clone");
     function collectIds(node) {
       if (!node || typeof node !== "object") return;
       if (node.id && typeof node.id === "string") {
@@ -1585,7 +1865,7 @@ var PixodeskAnimator = (() => {
         }
       }
     }
-    function updateRefs(node) {
+    function updateRefs(node, parentKey) {
       if (!node || typeof node !== "object") return;
       for (const [key, value] of Object.entries(node)) {
         if (key === "children") {
@@ -1605,7 +1885,7 @@ var PixodeskAnimator = (() => {
             }
           } else if (urlRefAttrs.has(key)) {
             node[key] = replaceUrlRefs(value, idMap);
-          } else if (directIdRefAttrs.has(key)) {
+          } else if (directIdRefAttrs.has(key) || isEffectSourceRef(key, parentKey)) {
             const hasHash = value.startsWith("#");
             const newId = idMap.get(hasHash ? value.slice(1) : value);
             if (newId) {
@@ -1621,13 +1901,13 @@ var PixodeskAnimator = (() => {
             }
           }
         } else if (typeof value === "object" && value !== null) {
-          updateRefs(value);
+          updateRefs(value, key);
         }
       }
     }
     collectIds(cloned);
     updateRefs(cloned);
-    const docAnimate = (_a = cloned.animator) == null ? void 0 : _a.animateById;
+    const docAnimate = (_a2 = cloned.animator) == null ? void 0 : _a2.animateById;
     if (docAnimate && typeof docAnimate === "object") {
       const updatedAnimate = {};
       for (const [key, anim] of Object.entries(docAnimate)) {
@@ -1647,7 +1927,7 @@ var PixodeskAnimator = (() => {
     });
   }
 
-  // ../svg-animator-core/src/PxNodeProps.ts
+  // ../svg-animator-core/src/util/PxNodeProps.ts
   var DISALLOWED_SVG_TAGS_LOWER = /* @__PURE__ */ new Set([
     "script",
     "foreignobject"
@@ -1686,7 +1966,7 @@ var PixodeskAnimator = (() => {
     if (nameLower.startsWith("on")) return true;
     return false;
   }
-  function sanitiseAttributeValue(name, value) {
+  function sanitizeAttributeValue(name, value) {
     const nameLower = name.toLowerCase();
     if (isDangerousAttrName(nameLower)) {
       console.warn("Attribute blocked (event handler / dangerous): ", nameLower);
@@ -1711,10 +1991,10 @@ var PixodeskAnimator = (() => {
     return value;
   }
   function resolveStyle(style, defs) {
-    var _a;
+    var _a2;
     if (!style) return void 0;
     if (typeof style === "string") {
-      return (_a = defs == null ? void 0 : defs.styles) == null ? void 0 : _a[style];
+      return (_a2 = defs == null ? void 0 : defs.styles) == null ? void 0 : _a2[style];
     }
     return style;
   }
@@ -1725,18 +2005,18 @@ var PixodeskAnimator = (() => {
       if (INTERNAL_ATTRS.has(key)) continue;
       if (key === "style") continue;
       let value = props[rawKey];
-      if (COLOUR_ATTR_NAMES.has(key) && Array.isArray(value)) {
+      if (COLOR_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) {
         const parts = value.value && typeof value.value === "object" ? value.value : value;
-        propsCopy["transform"] = composeTransformParts(parts, { withUnits: false });
+        propsCopy[TRANSFORM_ATTR] = composeTransformParts(parts, { withUnits: false });
       } else if (TRANSFORM_FN_NAMES.has(key)) {
         if (Array.isArray(value)) {
           if (key === "translate") value = value.map((v) => v + "px");
           value = value.join(",");
         }
         if (key === "rotate") value = value + "deg";
-        propsCopy["transform"] = key + "(" + value + ")";
+        propsCopy[TRANSFORM_ATTR] = key + "(" + value + ")";
       } else if (Array.isArray(value)) {
         propsCopy[key] = value.join(",");
       } else if (value !== void 0 && value !== null) {
@@ -1746,10 +2026,9 @@ var PixodeskAnimator = (() => {
     return propsCopy;
   }
 
-  // ../svg-animator-core/src/PxMotionPath.ts
+  // ../svg-animator-core/src/materialize/PxMotionPath.ts
   function getKfTranslate(kf) {
-    var _a;
-    const v = (_a = kf.value) != null ? _a : kf.v;
+    const v = kfValue(kf);
     if (!v) return void 0;
     if (Array.isArray(v) && v.length >= 2 && typeof v[0] === "number" && typeof v[1] === "number") {
       return [v[0], v[1]];
@@ -1759,31 +2038,27 @@ var PixodeskAnimator = (() => {
     return void 0;
   }
   function getKfTime(kf) {
-    var _a, _b;
-    return (_b = (_a = kf.time) != null ? _a : kf.t) != null ? _b : 0;
+    return kfTime(kf);
   }
   function getKfEasing(kf) {
-    var _a;
-    return (_a = kf.easing) != null ? _a : kf.e;
+    return kfEasing(kf);
   }
   function propAnimIsMotionPath(anim) {
-    var _a, _b;
     const kfs = anim.keyframes;
     if (!Array.isArray(kfs)) return false;
     if (anim.autoOrient) return true;
     for (const kf of kfs) {
-      if (((_a = kf.tangentIn) != null ? _a : kf.ti) || ((_b = kf.tangentOut) != null ? _b : kf.to)) return true;
+      if (kfTangentIn(kf) || kfTangentOut(kf)) return true;
     }
     return false;
   }
   var _segmentCache = /* @__PURE__ */ new WeakMap();
   function getSegmentCache(prevKf, nextKf, prevPos, nextPos) {
-    var _a, _b;
     let byNext = _segmentCache.get(prevKf);
     const existing = byNext == null ? void 0 : byNext.get(nextKf);
     if (existing) return existing;
-    const to = (_a = prevKf.tangentOut) != null ? _a : prevKf.to;
-    const ti = (_b = nextKf.tangentIn) != null ? _b : nextKf.ti;
+    const to = kfTangentOut(prevKf);
+    const ti = kfTangentIn(nextKf);
     const P1 = [prevPos[0] + (to ? to[0] : 0), prevPos[1] + (to ? to[1] : 0)];
     const P2 = [nextPos[0] + (ti ? ti[0] : 0), nextPos[1] + (ti ? ti[1] : 0)];
     const lut = bezier2D_arcLengthLUT(prevPos, P1, P2, nextPos);
@@ -1832,13 +2107,13 @@ var PixodeskAnimator = (() => {
   var DEFAULT_FLATNESS_TOL = 0.5;
   var DEFAULT_ROTATION_TOL = 5;
   var DEFAULT_MAX_SAMPLES = 32;
-  function materialiseMotionPathInPropAnim(anim, opts) {
-    var _a, _b, _c;
+  function materializeMotionPathInPropAnim(anim, opts) {
+    var _a2, _b, _c;
     if (!propAnimIsMotionPath(anim)) return anim;
     const kfs = anim.keyframes;
     if (!Array.isArray(kfs) || kfs.length < 2) return anim;
     const autoOrient = !!anim.autoOrient;
-    const flatnessTol = (_a = opts == null ? void 0 : opts.flatnessTolerance) != null ? _a : DEFAULT_FLATNESS_TOL;
+    const flatnessTol = (_a2 = opts == null ? void 0 : opts.flatnessTolerance) != null ? _a2 : 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 = [];
@@ -1864,7 +2139,7 @@ var PixodeskAnimator = (() => {
       if (autoOrient && i > 0) {
         insertSharpCornerStepKfIfNeeded(out, prevKf, nextKf, prevPos, nextPos, rotationTol);
       }
-      materialiseSegment(out, prevKf, nextKf, prevPos, nextPos, autoOrient, flatnessTol, rotationTol, maxSamples);
+      materializeSegment(out, prevKf, nextKf, prevPos, nextPos, autoOrient, flatnessTol, rotationTol, maxSamples);
     }
     const lastInE = getKfEasing(kfs[kfs.length - 1]);
     if (lastInE) out[out.length - 1].e = lastInE;
@@ -1874,10 +2149,9 @@ var PixodeskAnimator = (() => {
     return result;
   }
   function unwrapAutoOrientRotations(kfs) {
-    var _a;
     let prev;
     for (const kf of kfs) {
-      const v = (_a = kf.v) != null ? _a : kf.value;
+      const v = kfValue(kf);
       if (!v || typeof v.rotate !== "number") continue;
       if (prev === void 0) {
         prev = v.rotate;
@@ -1894,8 +2168,7 @@ var PixodeskAnimator = (() => {
     return { t: time, v: value };
   }
   function getKfValueParts(kf) {
-    var _a;
-    const v = (_a = kf.value) != null ? _a : kf.v;
+    const v = kfValue(kf);
     if (!v || typeof v !== "object" || Array.isArray(v)) return void 0;
     return v;
   }
@@ -1956,9 +2229,8 @@ var PixodeskAnimator = (() => {
     return d;
   }
   function insertSharpCornerStepKfIfNeeded(out, prevKf, nextKf, prevPos, nextPos, rotationTol) {
-    var _a;
     const lastKf = out[out.length - 1];
-    const lastV = (_a = lastKf.v) != null ? _a : lastKf.value;
+    const lastV = kfValue(lastKf);
     const prevExit = lastV == null ? void 0 : lastV.rotate;
     if (typeof prevExit !== "number") return;
     const boundaryV = getKfValueParts(prevKf);
@@ -1981,7 +2253,7 @@ var PixodeskAnimator = (() => {
     out.push(makeOutKf(stepTime, dupValue));
   }
   var CORNER_STEP_AFTER_BOUNDARY_MS = 0.05;
-  function materialiseSegment(out, prevKf, nextKf, prevPos, nextPos, autoOrient, flatnessTol, rotationTol, maxSamples) {
+  function materializeSegment(out, prevKf, nextKf, prevPos, nextPos, autoOrient, flatnessTol, rotationTol, maxSamples) {
     const seg = getSegmentCache(prevKf, nextKf, prevPos, nextPos);
     const prevTime = getKfTime(prevKf);
     const nextTime = getKfTime(nextKf);
@@ -2104,16 +2376,16 @@ var PixodeskAnimator = (() => {
     const cross = (q[0] - pA[0]) * dy - (q[1] - pA[1]) * dx;
     return Math.abs(cross) / Math.sqrt(len2);
   }
-  function materialiseMotionPathsInTree(root, opts) {
-    const out = walkAndMaterialise(root, opts);
+  function materializeMotionPathsInTree(root, opts) {
+    const out = walkAndMaterialize(root, opts);
     return out != null ? out : root;
   }
-  function walkAndMaterialise(node, opts) {
+  function walkAndMaterialize(node, opts) {
     let newChildren;
     if (node.children) {
       for (let i = 0; i < node.children.length; i++) {
         const ch = node.children[i];
-        const ret = walkAndMaterialise(ch, opts);
+        const ret = walkAndMaterialize(ch, opts);
         if (ret !== null) {
           if (!newChildren) newChildren = node.children.slice();
           newChildren[i] = ret;
@@ -2126,9 +2398,9 @@ var PixodeskAnimator = (() => {
       const animDef = animBucket;
       const transformAnim = animDef.transform;
       if (transformAnim && typeof transformAnim === "object" && propAnimIsMotionPath(transformAnim)) {
-        const materialised = materialiseMotionPathInPropAnim(transformAnim, opts);
-        if (materialised !== transformAnim) {
-          newAnimate = __spreadProps(__spreadValues({}, animDef), { transform: materialised });
+        const materialized = materializeMotionPathInPropAnim(transformAnim, opts);
+        if (materialized !== transformAnim) {
+          newAnimate = __spreadProps(__spreadValues({}, animDef), { transform: materialized });
         }
       }
     }
@@ -2139,7 +2411,7 @@ var PixodeskAnimator = (() => {
     return cloned;
   }
 
-  // ../svg-animator-core/src/PxDefinitions.ts
+  // ../svg-animator-core/src/animation/PxDefinitions.ts
   var LOOP_JUMP_SHIFT_MS = 1;
   function deepEqualValue(a, b) {
     if (a === b) return true;
@@ -2231,8 +2503,8 @@ var PixodeskAnimator = (() => {
     return typeof value === "string" && extractPathData(value) !== void 0;
   }
   function normalizePathValue(value) {
-    if (value && typeof value === "object" && typeof value.path === "string") {
-      const d = extractPathData(value.path);
+    if (value && typeof value === "object" && typeof value.pathData === "string") {
+      const d = extractPathData(value.pathData);
       return d ? { paths: parseSvgPathToBezier(d) } : value;
     }
     if (value && typeof value === "object" && "paths" in value) {
@@ -2271,21 +2543,21 @@ var PixodeskAnimator = (() => {
     return value;
   }
   function resolveEasing(easing, defs) {
-    var _a;
+    var _a2;
     if (!easing) return void 0;
     if (Array.isArray(easing)) {
       return easing;
     }
-    if ((_a = defs == null ? void 0 : defs.easings) == null ? void 0 : _a[easing]) {
+    if ((_a2 = defs == null ? void 0 : defs.easings) == null ? void 0 : _a2[easing]) {
       return defs.easings[easing];
     }
     console.warn("Unknown easing name: " + easing);
     return void 0;
   }
   function resolveAnimation(animRef, defs) {
-    var _a;
+    var _a2;
     if (typeof animRef === "string") {
-      const resolved = (_a = defs == null ? void 0 : defs.animations) == null ? void 0 : _a[animRef];
+      const resolved = (_a2 = defs == null ? void 0 : defs.animations) == null ? void 0 : _a2[animRef];
       if (!resolved) {
         console.warn("Unknown animation name: " + animRef);
       }
@@ -2310,13 +2582,13 @@ var PixodeskAnimator = (() => {
     return results;
   }
   function interpolateValue(propName, a, b, t) {
-    var _a, _b;
+    var _a2, _b;
     if (propName === "d") {
-      const aPaths = (_a = a == null ? void 0 : a.paths) != null ? _a : Array.isArray(a) ? a : [];
+      const aPaths = (_a2 = a == null ? void 0 : a.paths) != null ? _a2 : Array.isArray(a) ? a : [];
       const bPaths = (_b = b == null ? void 0 : b.paths) != null ? _b : Array.isArray(b) ? b : [];
       return { paths: interpolateBeziers(aPaths, bPaths, t) };
     }
-    if (COLOUR_ATTR_NAMES.has(propName)) {
+    if (COLOR_ATTR_NAMES.has(propName)) {
       return interpolateColor(a || [0, 0, 0, 1], b || [0, 0, 0, 1], t);
     }
     if (propName === "transform" && typeof a === "object" && a !== null && !Array.isArray(a) && typeof b === "object" && b !== null && !Array.isArray(b)) {
@@ -2348,11 +2620,11 @@ var PixodeskAnimator = (() => {
     return out;
   }
   function expandLoopKeyframes(propName, keyframes, loop, duration) {
-    var _a, _b, _c, _d, _e;
+    var _a2, _b, _c, _d, _e;
     const totalIntervals = keyframes.length - 1;
-    const segCount = clamp((_a = loop.segmentCount) != null ? _a : totalIntervals, 1, totalIntervals);
+    const segCount = clamp((_a2 = loop.segmentCount) != null ? _a2 : totalIntervals, 1, totalIntervals);
     let segKfs;
-    if (loop.extend === PxLoopExtend.before) {
+    if (loop.repeatAt === PxLoopRepeatAt.start) {
       segKfs = keyframes.slice(0, segCount + 1);
     } else {
       segKfs = keyframes.slice(totalIntervals - segCount);
@@ -2360,7 +2632,7 @@ var PixodeskAnimator = (() => {
     const firstT = (_b = keyframes[0].t) != null ? _b : 0;
     const lastT = (_c = keyframes[keyframes.length - 1].t) != null ? _c : 0;
     let fillStart, fillEnd;
-    if (loop.extend === PxLoopExtend.before) {
+    if (loop.repeatAt === PxLoopRepeatAt.start) {
       fillStart = 0;
       fillEnd = firstT;
     } else {
@@ -2373,26 +2645,23 @@ var PixodeskAnimator = (() => {
     const segEndT = (_e = segKfs[segKfs.length - 1].t) != null ? _e : 0;
     const segDuration = segEndT - segStartT;
     if (segDuration <= 0) return keyframes;
-    const template = segKfs.map((kf) => {
-      var _a2, _b2;
-      return {
-        relT: (kf.t - segStartT) / segDuration,
-        v: kf.v,
-        e: kf.e,
-        tangentIn: (_a2 = kf.tangentIn) != null ? _a2 : kf.ti,
-        tangentOut: (_b2 = kf.tangentOut) != null ? _b2 : kf.to
-      };
-    });
+    const template = segKfs.map((kf) => ({
+      relT: (kf.t - segStartT) / segDuration,
+      v: kf.v,
+      e: kf.e,
+      tangentIn: kfTangentIn(kf),
+      tangentOut: kfTangentOut(kf)
+    }));
     const fullReps = Math.floor(fillDuration / segDuration);
     const remainder = fillDuration - fullReps * segDuration;
     const partialFraction = remainder / segDuration;
     const looped = [];
-    const separateBoundary = loop.extend !== PxLoopExtend.before;
+    const separateBoundary = loop.repeatAt !== PxLoopRepeatAt.start;
     const originalTerminalKf = keyframes[keyframes.length - 1];
     let terminalEasingOverride;
     let hasTerminalEasingOverride = false;
     function appendRep(repStart, isReversed, partial) {
-      var _a2;
+      var _a3;
       let entries;
       if (isReversed) {
         entries = [];
@@ -2429,7 +2698,7 @@ var PixodeskAnimator = (() => {
           return;
         }
         const prevKf = looped.length > 0 ? looped[looped.length - 1] : originalTerminalKf;
-        const isBoundary = separateBoundary && i === 0 && prevKf !== void 0 && Math.abs(((_a2 = prevKf.t) != null ? _a2 : 0) - (repStart + entry.relT * segDuration)) < 1e-9;
+        const isBoundary = separateBoundary && i === 0 && prevKf !== void 0 && Math.abs(((_a3 = prevKf.t) != null ? _a3 : 0) - (repStart + entry.relT * segDuration)) < 1e-9;
         if (isBoundary) {
           if (deepEqualValue(prevKf.v, entry.v)) {
             if (looped.length > 0) {
@@ -2495,30 +2764,30 @@ var PixodeskAnimator = (() => {
         looped.push(pushed);
       }
     }
-    if (loop.extend === PxLoopExtend.before) {
+    if (loop.repeatAt === PxLoopRepeatAt.start) {
       if (partialFraction > 1e-9) {
-        const isReversed = !!loop.alternate && fullReps % 2 === 0;
+        const isReversed = loop.direction === PxLoopDirection.alternate && fullReps % 2 === 0;
         appendRepTail(fillStart, isReversed, partialFraction);
       }
       for (let rep = 0; rep < fullReps; rep++) {
         const distFromBoundary = fullReps - 1 - rep;
-        const isReversed = !!loop.alternate && distFromBoundary % 2 === 0;
+        const isReversed = loop.direction === PxLoopDirection.alternate && distFromBoundary % 2 === 0;
         const repStart = fillStart + remainder + rep * segDuration;
         appendRep(repStart, isReversed);
       }
     } else {
       for (let rep = 0; rep < fullReps; rep++) {
-        const isReversed = !!loop.alternate && rep % 2 === 0;
+        const isReversed = loop.direction === PxLoopDirection.alternate && rep % 2 === 0;
         const repStart = fillStart + rep * segDuration;
         appendRep(repStart, isReversed);
       }
       if (partialFraction > 1e-9) {
-        const isReversed = !!loop.alternate && fullReps % 2 === 0;
+        const isReversed = loop.direction === PxLoopDirection.alternate && fullReps % 2 === 0;
         const repStart = fillStart + fullReps * segDuration;
         appendRep(repStart, isReversed, partialFraction);
       }
     }
-    if (loop.extend === PxLoopExtend.before) {
+    if (loop.repeatAt === PxLoopRepeatAt.start) {
       return [...looped, ...keyframes];
     } else {
       if (hasTerminalEasingOverride && keyframes.length > 0) {
@@ -2530,34 +2799,34 @@ var PixodeskAnimator = (() => {
     }
   }
   function normalizeKeyframes(propName, propAnim, duration, defs) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a2;
     const keyframes = propAnim.keyframes || [];
     const normalized = [];
     for (const kf of keyframes) {
-      const timePct = (_b = (_a = kf.time) != null ? _a : kf.t) != null ? _b : 0;
-      let value = (_c = kf.value) != null ? _c : kf.v;
-      const easing = (_d = kf.easing) != null ? _d : kf.e;
+      const timePct = kfTime(kf);
+      let value = kfValue(kf);
+      const easing = kfEasing(kf);
       if (propName === "d") {
         value = normalizePathValue(value);
       }
       const propNameKebab = isCamelCaseWord(propName) ? camelCaseToKebabWordIfNeeded(propName) : propName;
-      if (COLOUR_ATTR_NAMES.has(propNameKebab)) {
-        value = (_e = parseColor(value)) != null ? _e : value;
+      if (COLOR_ATTR_NAMES.has(propNameKebab)) {
+        value = (_a2 = parseColor(value)) != null ? _a2 : value;
       }
       const normKf = {
         t: timePct,
         v: value,
         e: resolveEasing(easing, defs)
       };
-      const tIn = (_f = kf.tangentIn) != null ? _f : kf.ti;
-      const tOut = (_g = kf.tangentOut) != null ? _g : kf.to;
+      const tIn = kfTangentIn(kf);
+      const tOut = kfTangentOut(kf);
       if (tIn) normKf.tangentIn = tIn;
       if (tOut) normKf.tangentOut = tOut;
       normalized.push(normKf);
     }
     normalized.sort((a, b) => {
-      var _a2, _b2;
-      return ((_a2 = a.t) != null ? _a2 : 0) - ((_b2 = b.t) != null ? _b2 : 0);
+      var _a3, _b;
+      return ((_a3 = a.t) != null ? _a3 : 0) - ((_b = b.t) != null ? _b : 0);
     });
     const loopRaw = propAnim.loop;
     const loop = loopRaw === true ? {} : loopRaw || void 0;
@@ -2575,24 +2844,26 @@ var PixodeskAnimator = (() => {
     }
     return merged;
   }
-  function materialiseInternalLoopsInPropAnim(propName, propAnim, duration) {
+  function materializeInternalLoopsInPropAnim(propName, propAnim, duration) {
     const loopRaw = propAnim.loop;
     if (loopRaw === void 0 || loopRaw === null || loopRaw === false) return propAnim;
     const loop = loopRaw === true ? {} : loopRaw;
     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 isColor = COLOR_ATTR_NAMES.has(propNameKebab);
     const kfs = rawKfs.map((kf) => {
-      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;
+      var _a2;
+      const t = kfTime(kf);
+      let v = kfValue(kf);
       if (propName === "d") v = normalizePathValue(v);
-      if (isColour) v = (_c = parseColor(v)) != null ? _c : v;
-      const e = (_d = kf.e) != null ? _d : kf.easing;
+      if (isColor) v = (_a2 = parseColor(v)) != null ? _a2 : v;
+      const e = kfEasing(kf);
       const out2 = { t, v, e };
-      if ((_e = kf.tangentIn) != null ? _e : kf.ti) out2.tangentIn = (_f = kf.tangentIn) != null ? _f : kf.ti;
-      if ((_g = kf.tangentOut) != null ? _g : kf.to) out2.tangentOut = (_h = kf.tangentOut) != null ? _h : kf.to;
+      const tIn = kfTangentIn(kf);
+      const tOut = kfTangentOut(kf);
+      if (tIn) out2.tangentIn = tIn;
+      if (tOut) out2.tangentOut = tOut;
       return out2;
     });
     const expanded = expandLoopKeyframes(propName, kfs, loop, duration);
@@ -2600,15 +2871,15 @@ var PixodeskAnimator = (() => {
     if (propAnim.autoOrient !== void 0) out.autoOrient = propAnim.autoOrient;
     return out;
   }
-  function materialiseInternalLoopsInTree(root, duration) {
-    const ret = walkAndMaterialiseLoops(root, duration);
+  function materializeInternalLoopsInTree(root, duration) {
+    const ret = walkAndMaterializeLoops(root, duration);
     return ret != null ? ret : root;
   }
-  function walkAndMaterialiseLoops(node, duration) {
+  function walkAndMaterializeLoops(node, duration) {
     let newChildren;
     if (node.children) {
       for (let i = 0; i < node.children.length; i++) {
-        const ret = walkAndMaterialiseLoops(node.children[i], duration);
+        const ret = walkAndMaterializeLoops(node.children[i], duration);
         if (ret !== null) {
           if (!newChildren) newChildren = node.children.slice();
           newChildren[i] = ret;
@@ -2621,10 +2892,10 @@ var PixodeskAnimator = (() => {
       const animDef = animBucket;
       for (const propName of Object.keys(animDef)) {
         const propAnim = animDef[propName];
-        const materialised = materialiseInternalLoopsInPropAnim(propName, propAnim, duration);
-        if (materialised !== propAnim) {
+        const materialized = materializeInternalLoopsInPropAnim(propName, propAnim, duration);
+        if (materialized !== propAnim) {
           if (!newAnimate) newAnimate = __spreadValues({}, animDef);
-          newAnimate[propName] = materialised;
+          newAnimate[propName] = materialized;
         }
       }
     }
@@ -2643,7 +2914,7 @@ var PixodeskAnimator = (() => {
     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"];
+    const transformAnim = animDef[TRANSFORM_ATTR];
     if (transformAnim && typeof transformAnim === "object") {
       const anim = transformAnim;
       if (Array.isArray(anim.keyframes)) {
@@ -2668,7 +2939,7 @@ var PixodeskAnimator = (() => {
     delete rest[ch];
     return __spreadProps(__spreadValues({}, rest), { transform: lifted });
   }
-  function normalizeAnimationDefinition(animDef, duration, defs, engine = PxAnimatorEngine.waapi) {
+  function normalizeAnimationDefinition(animDef, duration, defs, engine = PxTimelineEngine.native) {
     const normalized = {};
     for (const [propName, propAnim] of Object.entries(animDef)) {
       if (propName === "transform" && propAnim.alongPathMode === "offsetPath" && animDef["offsetDistance"] !== void 0) {
@@ -2679,12 +2950,12 @@ var PixodeskAnimator = (() => {
         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;
+        normalized[propName] = engine === PxTimelineEngine.native && propName === "transform" ? materializeMotionPathInPropAnim(out) : out;
       }
     }
     return normalized;
   }
-  function getNormalisedBindings(doc, engine = PxAnimatorEngine.waapi) {
+  function getNormalizedBindings(doc, engine = PxTimelineEngine.native) {
     const animatorConfig = getAnimatorConfig(doc) || {};
     const defs = getDefs(doc);
     const duration = animatorConfig.duration || 1e3;
@@ -2730,12 +3001,12 @@ var PixodeskAnimator = (() => {
     return bindings;
   }
   function getKeyframesPair(keyframes, progress) {
-    var _a, _b;
+    var _a2, _b;
     const last = keyframes.length - 1;
     let prevKf = keyframes[0];
     let nextKf = keyframes[last > 0 ? 1 : 0];
     for (let j = 0; j < last; j++) {
-      const aOff = (_a = keyframes[j].t) != null ? _a : 0;
+      const aOff = (_a2 = keyframes[j].t) != null ? _a2 : 0;
       const bOff = (_b = keyframes[j + 1].t) != null ? _b : 0;
       if (aOff <= progress && progress <= bOff) {
         prevKf = keyframes[j];
@@ -2750,13 +3021,13 @@ var PixodeskAnimator = (() => {
     return { prevKf, nextKf };
   }
   function calcPropertyValue(propName, propAnim, progress) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a2, _b, _c, _d;
     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);
+    let localProgress = prevKf === nextKf ? 0 : remap(progress, (_a2 = prevKf.t) != null ? _a2 : 0, (_b = nextKf.t) != null ? _b : 0, 0, 1);
     localProgress = clamp(localProgress, 0, 1);
-    const easing = (_c = prevKf.e) != null ? _c : prevKf.easing;
+    const easing = kfEasing(prevKf);
     if (easing && Array.isArray(easing)) {
       try {
         localProgress = cubicBezier(easing)(localProgress);
@@ -2765,17 +3036,17 @@ var PixodeskAnimator = (() => {
     }
     let cssAttrName = isCamelCaseWord(propName) ? camelCaseToKebabWordIfNeeded(propName) : propName;
     let cssValue = null;
-    const prevV = (_d = prevKf == null ? void 0 : prevKf.v) != null ? _d : prevKf == null ? void 0 : prevKf.value;
-    const nextV = (_e = nextKf == null ? void 0 : nextKf.v) != null ? _e : nextKf == null ? void 0 : nextKf.value;
+    const prevV = prevKf == null ? void 0 : prevKf.v;
+    const nextV = nextKf == null ? void 0 : nextKf.v;
     if (cssAttrName === "d") {
-      const prevPaths = (_f = prevV == null ? void 0 : prevV.paths) != null ? _f : Array.isArray(prevV) ? prevV : [];
-      const nextPaths = (_g = nextV == null ? void 0 : nextV.paths) != null ? _g : Array.isArray(nextV) ? nextV : [];
+      const prevPaths = (_c = prevV == null ? void 0 : prevV.paths) != null ? _c : Array.isArray(prevV) ? prevV : [];
+      const nextPaths = (_d = nextV == null ? void 0 : nextV.paths) != null ? _d : Array.isArray(nextV) ? nextV : [];
       cssValue = interpolateBeziers(
         prevPaths,
         nextPaths,
         localProgress
       ).map((bz) => bezierToSvgPath(bz)).join("");
-    } else if (COLOUR_ATTR_NAMES.has(cssAttrName)) {
+    } else if (COLOR_ATTR_NAMES.has(cssAttrName)) {
       cssValue = toRGBA(interpolateColor(
         prevV || [0, 0, 0, 1],
         nextV || [0, 0, 0, 1],
@@ -2872,7 +3143,7 @@ var PixodeskAnimator = (() => {
     return result;
   }
 
-  // ../svg-animator-core/src/PxNodeCloneUtil.ts
+  // ../svg-animator-core/src/util/PxNodeCloneUtil.ts
   function deepClonePxNode(value) {
     if (value === null || typeof value !== "object") return value;
     if (Array.isArray(value)) return value.map(deepClonePxNode);
@@ -2883,13 +3154,13 @@ var PixodeskAnimator = (() => {
   function regenerateIdsAndRewriteRefs(root, genId3) {
     const oldToNew = /* @__PURE__ */ new Map();
     const walkAssign = (n) => {
-      var _a;
+      var _a2;
       if (typeof n.id === "string") {
         const newId = genId3();
         oldToNew.set(n.id, newId);
         n.id = newId;
       }
-      (_a = n.children) == null ? void 0 : _a.forEach(walkAssign);
+      (_a2 = n.children) == null ? void 0 : _a2.forEach(walkAssign);
     };
     walkAssign(root);
     const rewriteUrl = (s) => s.replace(/url\(#([^)]+)\)/g, (m, oldId) => {
@@ -2897,7 +3168,7 @@ var PixodeskAnimator = (() => {
       return newId ? "url(#" + newId + ")" : m;
     });
     const walkRewrite = (n) => {
-      var _a;
+      var _a2;
       if (typeof n.href === "string" && n.href.startsWith("#")) {
         const newId = oldToNew.get(n.href.slice(1));
         if (newId) n.href = "#" + newId;
@@ -2909,7 +3180,7 @@ var PixodeskAnimator = (() => {
           n[k] = rewriteUrl(v);
         }
       }
-      (_a = n.children) == null ? void 0 : _a.forEach(walkRewrite);
+      (_a2 = n.children) == null ? void 0 : _a2.forEach(walkRewrite);
     };
     walkRewrite(root);
     return oldToNew;
@@ -2919,7 +3190,7 @@ var PixodeskAnimator = (() => {
     return Number.isFinite(n) ? n : 0;
   }
   function applyUseOffsetToG(gNode) {
-    var _a;
+    var _a2;
     const x = toFiniteNum(gNode.x);
     const y = toFiniteNum(gNode.y);
     delete gNode.x;
@@ -2928,7 +3199,7 @@ var PixodeskAnimator = (() => {
     const offset = "translate(" + x + "," + y + ")";
     const carriesTransform = gNode.transform !== void 0 || gNode.animate !== void 0;
     if (carriesTransform) {
-      const inner = { type: "g", transform: offset, children: (_a = gNode.children) != null ? _a : [] };
+      const inner = { type: "g", transform: offset, children: (_a2 = gNode.children) != null ? _a2 : [] };
       gNode.children = [inner];
     } else {
       gNode.transform = offset;
@@ -2936,9 +3207,9 @@ var PixodeskAnimator = (() => {
     return gNode;
   }
 
-  // ../svg-animator-core/src/PxAnimatorUseMaterialiser.ts
-  function materialiseAnimatedUseInstances(root) {
-    var _a;
+  // ../svg-animator-core/src/materialize/PxAnimatorUseMaterializer.ts
+  function materializeAnimatedUseInstances(root) {
+    var _a2;
     const idMap = buildIdMap(root);
     const animatedIds = computeAnimatedSubtreeIds(root, idMap);
     if (animatedIds.size === 0) return root;
@@ -2946,10 +3217,10 @@ var PixodeskAnimator = (() => {
     const genId3 = () => "_lw_use_mat_" + ++idCounter;
     const rootViewport = readRootViewport(root);
     const defsCollector = [];
-    const walked = walkAndMaterialise2(root, idMap, animatedIds, genId3, defsCollector, rootViewport);
+    const walked = walkAndMaterialize2(root, idMap, animatedIds, genId3, defsCollector, rootViewport);
     if (defsCollector.length === 0) return walked;
     const defsNode = { type: "defs", children: defsCollector };
-    const newChildren = [...(_a = walked.children) != null ? _a : [], defsNode];
+    const newChildren = [...(_a2 = walked.children) != null ? _a2 : [], defsNode];
     return __spreadProps(__spreadValues({}, walked), { children: newChildren });
   }
   function readRootViewport(root) {
@@ -2971,9 +3242,9 @@ var PixodeskAnimator = (() => {
   function buildIdMap(root) {
     const map = /* @__PURE__ */ new Map();
     const visit = (n) => {
-      var _a;
+      var _a2;
       if (typeof n.id === "string") map.set(n.id, n);
-      (_a = n.children) == null ? void 0 : _a.forEach(visit);
+      (_a2 = n.children) == null ? void 0 : _a2.forEach(visit);
     };
     visit(root);
     return map;
@@ -3019,16 +3290,16 @@ var PixodeskAnimator = (() => {
     if (typeof href !== "string") return void 0;
     return href.startsWith("#") ? href.slice(1) : href;
   }
-  function materialiseOneUse(useNode, target, idMap, animatedIds, genId3, defsCollector, rootViewport) {
-    var _a, _b, _c, _d;
+  function materializeOneUse(useNode, target, idMap, animatedIds, genId3, defsCollector, rootViewport) {
+    var _a2, _b, _c, _d;
     const clone2 = deepClonePxNode(target);
     regenerateIdsAndRewriteRefs(clone2, genId3);
     const symbolViewBox = clone2.type === "symbol" ? parseViewBox(clone2.viewBox) : void 0;
-    const useW = (_b = (_a = numericAttr(useNode.width)) != null ? _a : symbolViewBox == null ? void 0 : symbolViewBox[2]) != null ? _b : rootViewport[0];
+    const useW = (_b = (_a2 = numericAttr(useNode.width)) != null ? _a2 : symbolViewBox == null ? void 0 : symbolViewBox[2]) != null ? _b : rootViewport[0];
     const useH = (_d = (_c = numericAttr(useNode.height)) != null ? _c : symbolViewBox == null ? void 0 : symbolViewBox[3]) != null ? _d : rootViewport[1];
     const rewrittenClone = clone2.type === "symbol" ? rewriteSymbolRootToGroup(clone2, genId3, defsCollector, useW, useH) : clone2;
-    const materialisedClone = walkAndMaterialise2(rewrittenClone, idMap, animatedIds, genId3, defsCollector, rootViewport);
-    const newNode = __spreadProps(__spreadValues({}, useNode), { type: "g", children: [materialisedClone] });
+    const materializedClone = walkAndMaterialize2(rewrittenClone, idMap, animatedIds, genId3, defsCollector, rootViewport);
+    const newNode = __spreadProps(__spreadValues({}, useNode), { type: "g", children: [materializedClone] });
     delete newNode.href;
     delete newNode.width;
     delete newNode.height;
@@ -3066,25 +3337,25 @@ var PixodeskAnimator = (() => {
     if (parts.length < 4 || parts.some((n) => !Number.isFinite(n))) return void 0;
     return [parts[0], parts[1], parts[2], parts[3]];
   }
-  function walkAndMaterialise2(node, idMap, animatedIds, genId3, defsCollector, rootViewport) {
+  function walkAndMaterialize2(node, idMap, animatedIds, genId3, defsCollector, rootViewport) {
     if (node.type === "use" && typeof node.href === "string") {
       const targetId = stripHash(node.href);
       if (targetId && animatedIds.has(targetId)) {
         const target = idMap.get(targetId);
-        if (target) return materialiseOneUse(node, target, idMap, animatedIds, genId3, defsCollector, rootViewport);
+        if (target) return materializeOneUse(node, target, idMap, animatedIds, genId3, defsCollector, rootViewport);
       }
     }
     if (!node.children) return node;
     let changed = false;
     const newChildren = node.children.map((ch) => {
-      const m = walkAndMaterialise2(ch, idMap, animatedIds, genId3, defsCollector, rootViewport);
+      const m = walkAndMaterialize2(ch, idMap, animatedIds, genId3, defsCollector, rootViewport);
       if (m !== ch) changed = true;
       return m;
     });
     return changed ? __spreadProps(__spreadValues({}, node), { children: newChildren }) : node;
   }
 
-  // ../svg-animator-core/src/effects/transformParts.ts
+  // ../svg-animator-core/src/effects/shared/transformParts.ts
   function partsRecord(part, value, origin) {
     const rec = {};
     if (part === "translate" /* Translate */) rec.translate = value;
@@ -3095,25 +3366,25 @@ var PixodeskAnimator = (() => {
     return rec;
   }
   function readAnimatable(raw) {
-    var _a, _b, _c;
+    var _a2, _b;
     if (raw === void 0) return { kind: "absent" /* Absent */ };
     if (Array.isArray(raw)) return { kind: "static" /* Static */, value: raw };
     if (typeof raw === "object") {
       const obj = raw;
-      const kfs = (_a = obj.keyframes) != null ? _a : obj.kfs;
+      const kfs = obj.keyframes;
       if (kfs) {
-        const out = { kind: "animated" /* Animated */, keyframes: kfs.map(normaliseKeyframe), autoOrient: obj.autoOrient, loop: obj.loop };
-        const base = (_b = obj.value) != null ? _b : obj.v;
+        const out = { kind: "animated" /* Animated */, keyframes: kfs.map(normalizeKeyframe), autoOrient: obj.autoOrient, loop: obj.loop };
+        const base = (_a2 = obj.value) != null ? _a2 : obj.v;
         if (base !== void 0 && out.kind === "animated" /* Animated */) out.base = base;
         return out;
       }
-      const staticValue = (_c = obj.value) != null ? _c : obj.v;
+      const staticValue = (_b = obj.value) != null ? _b : obj.v;
       if (staticValue !== void 0) return { kind: "static" /* Static */, value: staticValue };
     }
     return { kind: "static" /* Static */, value: raw };
   }
   function writeAnimatableChannel(node, attrName, read, opts) {
-    var _a, _b, _c, _d;
+    var _a2, _b, _c, _d;
     const toOut = (v) => (opts == null ? void 0 : opts.asString) && v !== void 0 && v !== null ? String(v) : v;
     if (read.kind === "absent" /* Absent */) return;
     if (read.kind === "static" /* Static */) {
@@ -3127,10 +3398,10 @@ var PixodeskAnimator = (() => {
     if (read.autoOrient !== void 0) block.autoOrient = read.autoOrient;
     animate[attrName] = block;
     node.animate = animate;
-    const baseline = (_d = (_b = read.base) != null ? _b : (_a = read.keyframes[0]) == null ? void 0 : _a.value) != null ? _d : (_c = read.keyframes[0]) == null ? void 0 : _c.v;
+    const baseline = (_d = (_b = read.base) != null ? _b : (_a2 = read.keyframes[0]) == null ? void 0 : _a2.value) != null ? _d : (_c = read.keyframes[0]) == null ? void 0 : _c.v;
     if (baseline !== void 0) node[attrName] = toOut(baseline);
   }
-  function normaliseKeyframe(kf) {
+  function normalizeKeyframe(kf) {
     if (!kf || typeof kf !== "object") return kf;
     const k = kf;
     if (k.t === void 0 && k.v === void 0 && k.e === void 0 && k.to === void 0 && k.ti === void 0) {
@@ -3145,12 +3416,12 @@ var PixodeskAnimator = (() => {
     return out;
   }
   function readStaticOrigin(raw, ctx) {
-    var _a;
+    var _a2;
     const o = readAnimatable(raw);
     if (o.kind === "absent" /* Absent */) return void 0;
     if (o.kind === "static" /* Static */) return o.value;
     ctx.warnings.push("transformBy.origin: animated origin approximated by its first keyframe");
-    return (_a = o.keyframes[0]) == null ? void 0 : _a.value;
+    return (_a2 = o.keyframes[0]) == null ? void 0 : _a2.value;
   }
   function keyframeWith(kf, value) {
     const out = { value };
@@ -3161,7 +3432,7 @@ var PixodeskAnimator = (() => {
     return out;
   }
 
-  // ../svg-animator-core/src/effects/transformationEffect.ts
+  // ../svg-animator-core/src/effects/transform/transformationEffect.ts
   function applyTransformByEffect(node, fx, ctx) {
     if (!fx) return node;
     delete node.transform;
@@ -3252,7 +3523,7 @@ var PixodeskAnimator = (() => {
     return inner;
   }
 
-  // ../svg-animator-core/src/effects/util.ts
+  // ../svg-animator-core/src/effects/shared/util.ts
   function genId(ctx, prefix) {
     return "_lw_" + prefix + "_" + ctx.nextId++;
   }
@@ -3260,9 +3531,9 @@ var PixodeskAnimator = (() => {
     return typeof href === "string" ? href.replace(/^#/, "") : void 0;
   }
   function indexById(node, map) {
-    var _a;
+    var _a2;
     if (typeof node.id === "string") map.set(node.id, node);
-    (_a = node.children) == null ? void 0 : _a.forEach((child) => indexById(child, map));
+    (_a2 = node.children) == null ? void 0 : _a2.forEach((child) => indexById(child, map));
   }
   function spliceDefs(root, defs) {
     if (!defs.length) return;
@@ -3274,11 +3545,11 @@ var PixodeskAnimator = (() => {
     return regenerateIdsAndRewriteRefs(root, () => genId(ctx, "retimed"));
   }
 
-  // ../svg-animator-core/src/effects/contentRefSplit.ts
+  // ../svg-animator-core/src/effects/reference/contentRefSplit.ts
   function identifyContentRefTargets(node, ctx, allocator) {
-    var _a, _b, _c;
-    if (node.type === "use" && ((_b = (_a = node.effects) == null ? void 0 : _a.clone) == null ? void 0 : _b.type) === "content") {
-      const sourceId = stripHash2(node.effects.clone.sourceId);
+    var _a2, _b, _c;
+    if (node.type === "use" && ((_b = (_a2 = node.effects) == null ? void 0 : _a2.clone) == null ? void 0 : _b.without) === "translate") {
+      const sourceId = stripHash2(node.effects.clone.source);
       if (typeof sourceId === "string" && sourceId && !ctx.contentRefInnerIds.has(sourceId)) {
         ctx.contentRefInnerIds.set(sourceId, allocator(sourceId));
       }
@@ -3303,10 +3574,10 @@ var PixodeskAnimator = (() => {
     return outerWrapper;
   }
   function liftBodyTranslate(node, transformBy) {
-    var _a, _b, _c;
+    var _a2, _b, _c;
     const out = {};
     let didLiftAnimate = false;
-    const animTr = (_a = node.animate) == null ? void 0 : _a.transform;
+    const animTr = (_a2 = node.animate) == null ? void 0 : _a2.transform;
     if (animTr && typeof animTr === "object" && Array.isArray(animTr.keyframes)) {
       const kfs = animTr.keyframes;
       const hasTranslate = kfs.some((kf) => kf.value && kf.value.translate);
@@ -3489,7 +3760,7 @@ var PixodeskAnimator = (() => {
     return false;
   }
 
-  // ../svg-animator-core/src/effects/gradientEffect.ts
+  // ../svg-animator-core/src/effects/paint/gradientEffect.ts
   function applyFillGradientEffect(node, fx, ctx) {
     return applyGradient(node, fx, ctx, "fill");
   }
@@ -3524,7 +3795,7 @@ var PixodeskAnimator = (() => {
     return out;
   }
   function applyGeomVec(out, xAttr, yAttr, raw) {
-    var _a, _b, _c;
+    var _a2, _b, _c;
     const read = readAnimatable(raw);
     if (read.kind === "absent" /* Absent */) return;
     if (read.kind === "static" /* Static */) {
@@ -3543,7 +3814,7 @@ var PixodeskAnimator = (() => {
       if (read.loop !== void 0) block.loop = read.loop;
       return block;
     };
-    const animate = (_a = out.animate) != null ? _a : {};
+    const animate = (_a2 = out.animate) != null ? _a2 : {};
     animate[xAttr] = axisChannel(0);
     animate[yAttr] = axisChannel(1);
     out.animate = animate;
@@ -3559,7 +3830,7 @@ var PixodeskAnimator = (() => {
     writeAnimatableChannel(out, attrName, read, { asString: true });
   }
   function buildStopChildren(stops, ctx) {
-    var _a, _b, _c, _d;
+    var _a2, _b;
     if (!stops) return [];
     const read = readAnimatable(stops);
     if (read.kind === "absent" /* Absent */) return [];
@@ -3569,14 +3840,14 @@ var PixodeskAnimator = (() => {
     const loopFromSource = read.loop;
     let stopCount = 0;
     for (const kf of kfs) {
-      const v = (_a = kf.value) != null ? _a : kf.v;
+      const v = kfValue(kf);
       if (Array.isArray(v) && v.length > stopCount) stopCount = v.length;
     }
     if (!stopCount) return [];
-    const firstKfValue = (_b = kfs[0].value) != null ? _b : kfs[0].v;
+    const firstKfValue = kfValue(kfs[0]);
     const baselineStops = [];
     for (let i = 0; i < stopCount; i++) {
-      const s = (_d = (_c = firstKfValue == null ? void 0 : firstKfValue[i]) != null ? _c : prevDefinedStop(kfs, 0, i)) != null ? _d : { offset: i / Math.max(1, stopCount - 1), color: "#000000" };
+      const s = (_b = (_a2 = firstKfValue == null ? void 0 : firstKfValue[i]) != null ? _a2 : prevDefinedStop(kfs, 0, i)) != null ? _b : { offset: i / Math.max(1, stopCount - 1), color: "#000000" };
       baselineStops.push({ offset: s.offset, color: s.color });
     }
     return baselineStops.map((bs, i) => animatedStopNode(bs, kfs, i, ctx, loopFromSource));
@@ -3589,16 +3860,16 @@ var PixodeskAnimator = (() => {
     };
   }
   function animatedStopNode(baseline, kfs, stopIdx, _ctx, loop) {
-    var _a, _b, _c, _d, _e;
+    var _a2;
     const colorKfs = [];
     const offsetKfs = [];
     let offsetVaries = false;
     for (const kf of kfs) {
-      const t = (_b = (_a = kf.time) != null ? _a : kf.t) != null ? _b : 0;
-      const arr = (_c = kf.value) != null ? _c : kf.v;
-      const sliced = (_d = arr == null ? void 0 : arr[stopIdx]) != null ? _d : prevDefinedStop(kfs, kfs.indexOf(kf), stopIdx);
+      const t = kfTime(kf);
+      const arr = kfValue(kf);
+      const sliced = (_a2 = arr == null ? void 0 : arr[stopIdx]) != null ? _a2 : prevDefinedStop(kfs, kfs.indexOf(kf), stopIdx);
       if (!sliced) continue;
-      const easing = (_e = kf.easing) != null ? _e : kf.e;
+      const easing = kfEasing(kf);
       const colorOut = { time: t, value: sliced.color };
       if (easing !== void 0) colorOut.easing = easing;
       colorKfs.push(colorOut);
@@ -3625,13 +3896,12 @@ var PixodeskAnimator = (() => {
     return stop;
   }
   function prevDefinedStop(kfs, fromIdx, stopIdx) {
-    var _a, _b;
     for (let i = fromIdx; i >= 0; i--) {
-      const arr = (_a = kfs[i].value) != null ? _a : kfs[i].v;
+      const arr = kfValue(kfs[i]);
       if (arr == null ? void 0 : arr[stopIdx]) return arr[stopIdx];
     }
     for (let i = fromIdx + 1; i < kfs.length; i++) {
-      const arr = (_b = kfs[i].value) != null ? _b : kfs[i].v;
+      const arr = kfValue(kfs[i]);
       if (arr == null ? void 0 : arr[stopIdx]) return arr[stopIdx];
     }
     return void 0;
@@ -3641,12 +3911,12 @@ var PixodeskAnimator = (() => {
     return pct + "%";
   }
 
-  // ../svg-animator-core/src/effects/clipPathEffect.ts
+  // ../svg-animator-core/src/effects/clipping/clipPathEffect.ts
   function applyClipPathEffect(node, fx, ctx) {
-    if (!(fx == null ? void 0 : fx.d)) return node;
+    if (!(fx == null ? void 0 : fx.pathData)) return node;
     const clipId = genId(ctx, "clip");
     const pathChild = { type: "path" };
-    const read = readAnimatable(fx.d);
+    const read = readAnimatable(fx.pathData);
     if (read.kind !== "absent" /* Absent */) {
       if (read.kind === "static" /* Static */) {
         pathChild.d = pathString(read.value);
@@ -3661,16 +3931,16 @@ var PixodeskAnimator = (() => {
   }
   function pathString(v) {
     if (typeof v === "string") return v;
-    if (v && typeof v === "object" && typeof v.path === "string") return v.path;
+    if (v && typeof v === "object" && typeof v.pathData === "string") return v.pathData;
     return void 0;
   }
 
-  // ../svg-animator-core/src/effects/maskedByEffect.ts
+  // ../svg-animator-core/src/effects/clipping/maskedByEffect.ts
   function applyMaskedByEffect(node, fx, transformBy, ctx) {
     if (!fx) return node;
-    const sourceId = stripHash2(fx.sourceId);
+    const sourceId = stripHash2(fx.source);
     if (!sourceId) {
-      ctx.errors.push("maskedBy.sourceId missing \u2014 cannot build mask");
+      ctx.errors.push("maskedBy.source missing \u2014 cannot build mask");
       return node;
     }
     const maskId = genId(ctx, "mask");
@@ -3708,8 +3978,8 @@ var PixodeskAnimator = (() => {
   }
   function wrapInversePart(inner, part, raw, origin, ctx) {
     if (raw === void 0) return inner;
-    const normalisedRaw = part === "scale" /* Scale */ && Array.isArray(raw) ? [raw[0] / 100, raw[1] / 100] : raw;
-    const v = readAnimatable(normalisedRaw);
+    const normalizedRaw = part === "scale" /* Scale */ && Array.isArray(raw) ? [raw[0] / 100, raw[1] / 100] : raw;
+    const v = readAnimatable(normalizedRaw);
     if (v.kind === "static" /* Static */) {
       return { type: "g", transform: { value: partsRecord(part, invertPartValue(part, v.value), origin) }, children: [inner] };
     }
@@ -3733,16 +4003,16 @@ var PixodeskAnimator = (() => {
     return [1 / value[0], 1 / value[1]];
   }
   function negatedSpatialTangents(kf) {
-    var _a, _b;
+    var _a2, _b;
     const out = {};
-    const to = (_a = kf.tangentOut) != null ? _a : kf.to;
+    const to = (_a2 = kf.tangentOut) != null ? _a2 : kf.to;
     const ti = (_b = kf.tangentIn) != null ? _b : kf.ti;
     if (Array.isArray(to)) out.tangentOut = [-to[0], -to[1]];
     if (Array.isArray(ti)) out.tangentIn = [-ti[0], -ti[1]];
     return out;
   }
   function wrapInverseAnimatedBodyTransform(inner, node, _ctx) {
-    var _a;
+    var _a2;
     const animate = node.animate && typeof node.animate === "object" && !Array.isArray(node.animate) ? node.animate : void 0;
     const animTr = animate == null ? void 0 : animate.transform;
     const kfs = animTr && typeof animTr === "object" && Array.isArray(animTr.keyframes) ? animTr.keyframes : void 0;
@@ -3751,7 +4021,7 @@ var PixodeskAnimator = (() => {
     const rotateKfs = [];
     const scaleKfs = [];
     for (const kf of kfs) {
-      const v = ((_a = kf.value) != null ? _a : kf.v) || {};
+      const v = ((_a2 = kf.value) != null ? _a2 : kf.v) || {};
       const baseKf = keyframeWith(kf, void 0);
       if (Array.isArray(v.translate)) {
         translateKfs.push(__spreadProps(__spreadValues(__spreadValues({}, baseKf), negatedSpatialTangents(kf)), { value: { translate: [-v.translate[0], -v.translate[1]] } }));
@@ -3815,7 +4085,7 @@ var PixodeskAnimator = (() => {
     return void 0;
   }
   function parseTransformStringToParts(s) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
     const re = /([a-zA-Z]+)\s*\(([^)]*)\)/g;
     let m;
     const ops = [];
@@ -3829,7 +4099,7 @@ var PixodeskAnimator = (() => {
       for (let j = ops.length - 2; j >= 0; j--) {
         const cand = ops[j];
         if (cand.name !== "translate") continue;
-        const ox = (_a = cand.args[0]) != null ? _a : 0;
+        const ox = (_a2 = cand.args[0]) != null ? _a2 : 0;
         const oy = (_b = cand.args[1]) != null ? _b : 0;
         const lx = (_c = last.args[0]) != null ? _c : 0;
         const ly = (_d = last.args[1]) != null ? _d : 0;
@@ -3944,8 +4214,8 @@ var PixodeskAnimator = (() => {
   function collectMaskAncestorChains(root, ctx) {
     const interestingNodes = /* @__PURE__ */ new Set();
     const collectInterestingNodes = (n) => {
-      var _a, _b;
-      const maskSourceId = stripHash2((_b = (_a = n.effects) == null ? void 0 : _a.maskedBy) == null ? void 0 : _b.sourceId);
+      var _a2, _b;
+      const maskSourceId = stripHash2((_b = (_a2 = n.effects) == null ? void 0 : _a2.maskedBy) == null ? void 0 : _b.source);
       if (typeof maskSourceId === "string") {
         interestingNodes.add(n);
         const sourceNode = ctx.idMap.get(maskSourceId);
@@ -3966,7 +4236,7 @@ var PixodeskAnimator = (() => {
     walk(root, []);
   }
   function extractTranslateOnly(node, ctx) {
-    var _a, _b, _c;
+    var _a2, _b, _c;
     const tr = node.transform;
     const animateBlock = node.animate && typeof node.animate === "object" && !Array.isArray(node.animate) ? node.animate.transform : void 0;
     if (tr === void 0 && !animateBlock) return void 0;
@@ -3974,7 +4244,7 @@ var PixodeskAnimator = (() => {
     if (typeof tr === "string") {
       const parts = parseTranslateOnlyFromString(tr, ctx);
       if (parts) out.translate = parts;
-    } else if (tr && typeof tr === "object" && !tr.keyframes && !tr.kfs) {
+    } else if (tr && typeof tr === "object" && !tr.keyframes) {
       const wrapped = tr.value;
       const value = wrapped && typeof wrapped === "object" ? wrapped : tr;
       if (value && typeof value === "object" && Array.isArray(value.translate)) {
@@ -3988,7 +4258,7 @@ var PixodeskAnimator = (() => {
       const kfs = animateBlock.keyframes;
       const translateKfs = [];
       for (const kf of kfs) {
-        const v = (_a = kf.value) != null ? _a : kf.v;
+        const v = (_a2 = kf.value) != null ? _a2 : kf.v;
         const t = (_c = (_b = kf.time) != null ? _b : kf.t) != null ? _c : 0;
         if (v && typeof v === "object" && Array.isArray(v.translate)) {
           translateKfs.push({ time: t, value: [v.translate[0] || 0, v.translate[1] || 0] });
@@ -4022,16 +4292,15 @@ var PixodeskAnimator = (() => {
     return seen ? [x, y] : void 0;
   }
 
-  // ../svg-animator-core/src/effects/refEffect.ts
-  var CONTENT_SUBREF = "content";
+  // ../svg-animator-core/src/effects/reference/refEffect.ts
   function applyRefHref(node, clone2, ctx) {
     if (!clone2) return;
-    const sourceId = stripHash2(clone2.sourceId);
+    const sourceId = stripHash2(clone2.source);
     if (!sourceId) {
-      if (clone2.type === CONTENT_SUBREF) ctx.errors.push("clone: content ref missing sourceId");
+      if (clone2.without === PxCloneWithout.translate) ctx.errors.push("clone: content ref missing `source`");
       return;
     }
-    const targetId = clone2.type === CONTENT_SUBREF ? ctx.contentRefInnerIds.get(sourceId) || sourceId : sourceId;
+    const targetId = clone2.without === PxCloneWithout.translate ? ctx.contentRefInnerIds.get(sourceId) || sourceId : sourceId;
     node.href = "#" + targetId;
   }
   function applyRefAndTransformationEffect(node, clone2, transformBy, ctx) {
@@ -4039,11 +4308,11 @@ var PixodeskAnimator = (() => {
     return applyTransformByEffect(node, transformBy, ctx);
   }
 
-  // ../svg-animator-core/src/effects/repeaterEffect.ts
+  // ../svg-animator-core/src/effects/transform/repeaterEffect.ts
   function applyRepeaterEffect(node, fx, ctx) {
-    var _a, _b;
+    var _a2, _b;
     if (!fx) return node;
-    const copies = (_a = fx.copies) != null ? _a : 1;
+    const copies = (_a2 = fx.copies) != null ? _a2 : 1;
     if (copies < 1) {
       ctx.errors.push("repeater.copies invalid: " + fx.copies);
       return node;
@@ -4110,11 +4379,11 @@ var PixodeskAnimator = (() => {
     return mapAnimatable(raw, scalePower, true);
   }
 
-  // ../svg-animator-core/src/effects/retimeEffect.ts
-  var RETIME_MATERIALISATION_MODE_INLINE_G = false;
+  // ../svg-animator-core/src/effects/reference/retimeEffect.ts
+  var RETIME_MATERIALIZATION_MODE_INLINE_G = false;
   function asRetime(r) {
-    var _a, _b;
-    return { start: (_a = r.start) != null ? _a : 0, stretch: (_b = r.stretch) != null ? _b : 1 };
+    var _a2, _b;
+    return { start: (_a2 = r.start) != null ? _a2 : 0, stretch: (_b = r.stretch) != null ? _b : 1 };
   }
   var CROP_EDGE_MS = 1;
   function applyTimeCrop(useNode, crop, ctx) {
@@ -4142,12 +4411,12 @@ var PixodeskAnimator = (() => {
     };
   }
   function readCloneRetime(n) {
-    var _a, _b;
-    return (_b = (_a = n.effects) == null ? void 0 : _a.clone) == null ? void 0 : _b.retime;
+    var _a2, _b;
+    return (_b = (_a2 = n.effects) == null ? void 0 : _a2.clone) == null ? void 0 : _b.retime;
   }
   function clearCloneRetime(n) {
-    var _a;
-    const clone2 = (_a = n.effects) == null ? void 0 : _a.clone;
+    var _a2;
+    const clone2 = (_a2 = n.effects) == null ? void 0 : _a2.clone;
     if (!clone2) return;
     delete clone2.retime;
     if (Object.keys(clone2).length === 0) delete n.effects.clone;
@@ -4158,9 +4427,9 @@ var PixodeskAnimator = (() => {
     indexById(root, ctx.idMap);
     const sites = [];
     const collect = (n) => {
-      var _a;
+      var _a2;
       if (readCloneRetime(n)) sites.push(n);
-      (_a = n.children) == null ? void 0 : _a.forEach(collect);
+      (_a2 = n.children) == null ? void 0 : _a2.forEach(collect);
     };
     collect(root);
     const reachCount = /* @__PURE__ */ new Map();
@@ -4168,7 +4437,7 @@ var PixodeskAnimator = (() => {
       let count = 0;
       const visited = /* @__PURE__ */ new Set();
       const walk = (n) => {
-        var _a;
+        var _a2;
         if (!n) return;
         if (n !== site && readCloneRetime(n)) count++;
         if (n.type === "use" && n.href) {
@@ -4178,7 +4447,7 @@ var PixodeskAnimator = (() => {
             walk(ctx.idMap.get(id));
           }
         }
-        (_a = n.children) == null ? void 0 : _a.forEach(walk);
+        (_a2 = n.children) == null ? void 0 : _a2.forEach(walk);
       };
       const rootId = stripHash2(site.href);
       if (rootId) {
@@ -4188,19 +4457,19 @@ var PixodeskAnimator = (() => {
       reachCount.set(site, count);
     }
     sites.sort((a, b) => {
-      var _a, _b;
-      return ((_a = reachCount.get(b)) != null ? _a : 0) - ((_b = reachCount.get(a)) != null ? _b : 0);
+      var _a2, _b;
+      return ((_a2 = reachCount.get(b)) != null ? _a2 : 0) - ((_b = reachCount.get(a)) != null ? _b : 0);
     });
     for (const useNode of sites) {
       const retime = readCloneRetime(useNode);
       if (!retime) continue;
       const crop = retime.timeCrop;
       clearCloneRetime(useNode);
-      materialiseRetime(useNode, asRetime(retime), ctx);
+      materializeRetime(useNode, asRetime(retime), ctx);
       if (crop) applyTimeCrop(useNode, crop, ctx);
     }
   }
-  function materialiseRetime(useNode, retime, ctx) {
+  function materializeRetime(useNode, retime, ctx) {
     const targetId = stripHash2(useNode.href);
     if (!targetId) {
       ctx.errors.push("retime: <use> has no href to follow");
@@ -4208,7 +4477,7 @@ var PixodeskAnimator = (() => {
     }
     const chainRootId = buildChainClone(targetId, retime, ctx, /* @__PURE__ */ new Set());
     if (!chainRootId) return;
-    if (RETIME_MATERIALISATION_MODE_INLINE_G) {
+    if (RETIME_MATERIALIZATION_MODE_INLINE_G) {
       const cloneNode = ctx.idMap.get(chainRootId);
       useNode.type = "g";
       delete useNode.href;
@@ -4248,15 +4517,15 @@ var PixodeskAnimator = (() => {
         if (subId2) cloneNode.href = "#" + subId2;
       }
     } else {
-      materialiseNestedRetimeUses(cloneNode, accum, ctx, chain, targetId);
+      materializeNestedRetimeUses(cloneNode, accum, ctx, chain, targetId);
     }
     ctx.defs.push(cloneNode);
     if (typeof cloneNode.id === "string") ctx.idMap.set(cloneNode.id, cloneNode);
     return typeof cloneNode.id === "string" ? cloneNode.id : void 0;
   }
-  function materialiseNestedRetimeUses(node, accum, ctx, chain, parentTargetId) {
+  function materializeNestedRetimeUses(node, accum, ctx, chain, parentTargetId) {
     const visit = (n) => {
-      var _a;
+      var _a2;
       const retime = readCloneRetime(n);
       if (n.type === "use" && retime && n.href) {
         const subId = stripHash2(n.href);
@@ -4269,14 +4538,14 @@ var PixodeskAnimator = (() => {
         }
         clearCloneRetime(n);
       }
-      (_a = n.children) == null ? void 0 : _a.forEach(visit);
+      (_a2 = n.children) == null ? void 0 : _a2.forEach(visit);
     };
     visit(node);
   }
   function remapKeyframeTimes(node, start, stretch) {
-    var _a;
+    var _a2;
     remapKeyframeTimesOnly(node, start, stretch);
-    (_a = node.children) == null ? void 0 : _a.forEach((c) => remapKeyframeTimes(c, start, stretch));
+    (_a2 = node.children) == null ? void 0 : _a2.forEach((c) => remapKeyframeTimes(c, start, stretch));
   }
   function remapKeyframeTimesOnly(node, start, stretch) {
     const remap2 = (kfs) => {
@@ -4293,7 +4562,7 @@ var PixodeskAnimator = (() => {
     }
   }
 
-  // ../svg-animator-core/src/effects/pathSampler.ts
+  // ../svg-animator-core/src/effects/text/pathSampler.ts
   var LUT_STEPS = 48;
   var CMD_RE = /[MmLlHhVvCcSsQqTtAaZz]/;
   function tokenize(d) {
@@ -4441,7 +4710,7 @@ var PixodeskAnimator = (() => {
     };
   }
 
-  // ../svg-animator-core/src/effects/textPathEffect.ts
+  // ../svg-animator-core/src/effects/text/textPathEffect.ts
   var EXTEND_MARGIN_FRAC = 0.15;
   function numRange(v) {
     const read = readAnimatable(v);
@@ -4455,10 +4724,10 @@ var PixodeskAnimator = (() => {
   function estimateTextAdvance(node) {
     let chars = 0, maxFont = 16;
     const walk = (el) => {
-      var _a, _b;
-      const fs = parseFloat(String((_a = el.fontSize) != null ? _a : "")) || 0;
+      var _a2;
+      const fs = parseFloat(String((_a2 = el.fontSize) != null ? _a2 : "")) || 0;
       if (fs) maxFont = Math.max(maxFont, fs);
-      const t = (_b = el.text) != null ? _b : el.textContent;
+      const t = el.textContent;
       if (typeof t === "string") chars += t.length;
       if (el.children) for (const c of el.children) walk(c);
     };
@@ -4480,14 +4749,14 @@ var PixodeskAnimator = (() => {
     return out;
   }
   function extendedPathForBrowser(pathD, opts) {
-    var _a;
+    var _a2;
     if (opts.pathOverflow === "clip") return { d: pathD, startShift: 0 };
     const sampler = createPathSampler(pathD);
     if (!sampler || sampler.closed || sampler.totalLength <= 0) return { d: pathD, startShift: 0 };
     const L = sampler.totalLength;
     const margin = EXTEND_MARGIN_FRAC * L;
     const so = numRange(opts.startOffset);
-    const runWidth = numRange(opts.textLength).max || ((_a = opts.advance) != null ? _a : 0);
+    const runWidth = numRange(opts.textLength).max || ((_a2 = opts.advance) != null ? _a2 : 0);
     const startOverflow = Math.max(0, -so.min);
     const endOverflow = Math.max(0, so.max + runWidth - L);
     const startExt = startOverflow > 0 ? startOverflow + margin : 0;
@@ -4508,10 +4777,10 @@ var PixodeskAnimator = (() => {
     return { d, startShift: startExt };
   }
   function applyTextPathEffect(node, fx, ctx) {
-    var _a;
-    if (!fx || typeof fx.path !== "string" || !fx.path) return node;
+    var _a2;
+    if (!fx || typeof fx.pathData !== "string" || !fx.pathData) return node;
     const pathId = genId(ctx, "tpath");
-    const { d, startShift } = extendedPathForBrowser(fx.path, {
+    const { d, startShift } = extendedPathForBrowser(fx.pathData, {
       pathOverflow: fx.pathOverflow,
       startOffset: fx.startOffset,
       textLength: fx.textLength,
@@ -4521,7 +4790,7 @@ var PixodeskAnimator = (() => {
     const textPath = {
       type: "textPath",
       href: "#" + pathId,
-      children: (_a = node.children) != null ? _a : []
+      children: (_a2 = node.children) != null ? _a2 : []
     };
     if (fx.lengthAdjust !== void 0) textPath.lengthAdjust = fx.lengthAdjust;
     if (fx.method !== void 0) textPath.method = fx.method;
@@ -4536,7 +4805,7 @@ var PixodeskAnimator = (() => {
     writeAnimatableChannel(node, attrName, readAnimatable(raw), { asString: true });
   }
 
-  // ../svg-animator-core/src/effects/elementFactory.ts
+  // ../svg-animator-core/src/effects/text/elementFactory.ts
   var jsonElementFactory = (type, props, children) => {
     const node = { type };
     for (const k in props) if (props[k] !== void 0) node[k] = props[k];
@@ -4545,7 +4814,7 @@ var PixodeskAnimator = (() => {
     return node;
   };
 
-  // ../svg-animator-core/src/effects/glyphPathBake.ts
+  // ../svg-animator-core/src/effects/text/glyphPathBake.ts
   function fmt(v, decimals) {
     return Math.round(v) === v ? "" + Math.round(v) : v.toFixed(decimals);
   }
@@ -4591,7 +4860,7 @@ var PixodeskAnimator = (() => {
     return out;
   }
 
-  // ../svg-animator-core/src/effects/textGlyphsEffect.ts
+  // ../svg-animator-core/src/effects/text/textGlyphsEffect.ts
   var DEFAULT_FONT_SIZE = 16;
   var TEXT_ATTR_KEYS = [
     "fontFamily",
@@ -4613,7 +4882,6 @@ var PixodeskAnimator = (() => {
     "stroke",
     "strokeWidth",
     "effects",
-    TEXT_ATTR,
     TEXT_CONTENT_ATTR,
     "xml:space"
   ];
@@ -4651,15 +4919,15 @@ var PixodeskAnimator = (() => {
     return out;
   }
   function resolveStyle2(node, parent) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     const isTextRoot = node.type === "text";
     const nodeStyle = node.style;
     const own = (key) => {
-      var _a2;
-      return isTextRoot ? void 0 : (_a2 = node[key]) != null ? _a2 : nodeStyle == null ? void 0 : nodeStyle[key];
+      var _a3;
+      return isTextRoot ? void 0 : (_a3 = node[key]) != null ? _a3 : nodeStyle == null ? void 0 : nodeStyle[key];
     };
     const res = {
-      fontFamily: (_a = str(node.fontFamily)) != null ? _a : parent.fontFamily,
+      fontFamily: (_a2 = str(node.fontFamily)) != null ? _a2 : parent.fontFamily,
       fontSize: (_b = parseLen(node.fontSize)) != null ? _b : parent.fontSize,
       fill: (_c = node.fill) != null ? _c : parent.fill,
       stroke: (_d = node.stroke) != null ? _d : parent.stroke,
@@ -4676,10 +4944,10 @@ var PixodeskAnimator = (() => {
     return res;
   }
   function rootStyleOf(node) {
-    var _a, _b, _c;
+    var _a2, _b, _c;
     return {
       fontFamily: str(node.fontFamily),
-      fontSize: (_a = parseLen(node.fontSize)) != null ? _a : DEFAULT_FONT_SIZE,
+      fontSize: (_a2 = parseLen(node.fontSize)) != null ? _a2 : DEFAULT_FONT_SIZE,
       fill: node.fill,
       stroke: node.stroke,
       strokeWidth: node.strokeWidth,
@@ -4700,9 +4968,9 @@ var PixodeskAnimator = (() => {
     return p;
   }
   function glyphFontFor(s, glyphs, soleFont, warnings) {
-    var _a;
+    var _a2;
     const gf = s.fontFamily ? glyphs[s.fontFamily] : soleFont;
-    if (!gf) warnings == null ? void 0 : warnings.push('textGlyphs: no glyphs for font "' + ((_a = s.fontFamily) != null ? _a : "") + '"');
+    if (!gf) warnings == null ? void 0 : warnings.push('textGlyphs: no glyphs for font "' + ((_a2 = s.fontFamily) != null ? _a2 : "") + '"');
     return gf;
   }
   function soleFontOf(glyphs) {
@@ -4723,26 +4991,26 @@ var PixodeskAnimator = (() => {
     const ix0 = x0 + t, ix1 = x1 - t, iyb = -t, iyt = y1 + t;
     return outer + "M" + ix0 + " " + iyb + "L" + ix0 + " " + iyt + "L" + ix1 + " " + iyt + "L" + ix1 + " " + iyb + "Z";
   }
-  function materialiseGlyphTextHorizontal(node, opts) {
-    var _a, _b, _c, _d;
+  function materializeGlyphTextHorizontal(node, opts) {
+    var _a2, _b, _c;
     const { glyphs, create = jsonElementFactory, warnings } = opts;
     const soleFont = soleFontOf(glyphs);
-    const pen = { x: (_a = parseLen(node.x)) != null ? _a : 0, y: (_b = parseLen(node.y)) != null ? _b : 0 };
+    const pen = { x: (_a2 = parseLen(node.x)) != null ? _a2 : 0, y: (_b = parseLen(node.y)) != null ? _b : 0 };
     const placements = [];
     const lines = [{ start: pen.x, end: pen.x }];
     let line = 0;
     const renderChars = (content, s) => {
-      var _a2;
+      var _a3;
       const gf = glyphFontFor(s, glyphs, soleFont, warnings);
       const upm = (gf == null ? void 0 : gf.unitsPerEm) || 1e3;
       const scale = s.fontSize / upm;
-      const ascentEm = (_a2 = gf == null ? void 0 : gf.ascent) != null ? _a2 : 0.9 * upm;
+      const ascentEm = (_a3 = gf == null ? void 0 : gf.ascent) != null ? _a3 : 0.9 * upm;
       const paint = paintOf(s);
       for (let i = 0; i < content.length; i++) {
         const ch = content.charAt(i);
         const g = gf == null ? void 0 : gf.glyphs[ch];
-        if (g && g.d) {
-          placements.push({ glyphD: g.d, m: [scale, 0, 0, scale, pen.x, pen.y], paint, line, x: pen.x, y: pen.y, scale });
+        if (g && g.pathData) {
+          placements.push({ glyphD: g.pathData, m: [scale, 0, 0, scale, pen.x, pen.y], paint, line, x: pen.x, y: pen.y, scale });
           pen.x += g.width * scale;
         } else if (/\S/.test(ch)) {
           const advEm = g && g.width > 0 ? g.width : MISSING_GLYPH_ADVANCE_EM * upm;
@@ -4756,7 +5024,7 @@ var PixodeskAnimator = (() => {
       }
     };
     const walk = (el, parentStyle) => {
-      var _a2, _b2, _c2, _d2;
+      var _a3, _b2, _c2;
       const s = resolveStyle2(el, parentStyle);
       const x = parseLen(el.x);
       const y = parseLen(el.y);
@@ -4766,16 +5034,16 @@ var PixodeskAnimator = (() => {
         lines.push({ start: pen.x, end: pen.x });
       }
       if (y !== void 0) pen.y = y;
-      pen.x += (_a2 = parseLen(el.dx)) != null ? _a2 : 0;
+      pen.x += (_a3 = parseLen(el.dx)) != null ? _a3 : 0;
       pen.y += (_b2 = parseLen(el.dy)) != null ? _b2 : 0;
-      const content = (_c2 = str(el[TEXT_CONTENT_ATTR])) != null ? _c2 : str(el[TEXT_ATTR]);
-      if (content && !((_d2 = el.children) == null ? void 0 : _d2.length)) renderChars(content, s);
+      const content = str(el[TEXT_CONTENT_ATTR]);
+      if (content && !((_c2 = el.children) == null ? void 0 : _c2.length)) renderChars(content, s);
       if (el.children) for (const ch of el.children) walk(ch, s);
     };
     const rootStyle = rootStyleOf(node);
     if (node.children) for (const ch of node.children) walk(ch, rootStyle);
-    const rootContent = (_c = str(node[TEXT_CONTENT_ATTR])) != null ? _c : str(node[TEXT_ATTR]);
-    if (rootContent && !((_d = node.children) == null ? void 0 : _d.length)) renderChars(rootContent, rootStyle);
+    const rootContent = str(node[TEXT_CONTENT_ATTR]);
+    if (rootContent && !((_c = node.children) == null ? void 0 : _c.length)) renderChars(rootContent, rootStyle);
     const anchor = str(node.textAnchor);
     if (anchor === "middle" || anchor === "end") {
       for (const p of placements) {
@@ -4790,21 +5058,21 @@ var PixodeskAnimator = (() => {
     const cells = [];
     let adv = 0;
     const walk = (el, parentStyle) => {
-      var _a, _b, _c;
+      var _a2, _b;
       const s = resolveStyle2(el, parentStyle);
-      const content = (_a = str(el[TEXT_CONTENT_ATTR])) != null ? _a : str(el[TEXT_ATTR]);
-      if (content && !((_b = el.children) == null ? void 0 : _b.length)) {
+      const content = str(el[TEXT_CONTENT_ATTR]);
+      if (content && !((_a2 = el.children) == null ? void 0 : _a2.length)) {
         const gf = glyphFontFor(s, glyphs, soleFont, warnings);
         if (gf) {
           const scale = s.fontSize / gf.unitsPerEm;
-          const ascentEm = (_c = gf.ascent) != null ? _c : 0.9 * gf.unitsPerEm;
+          const ascentEm = (_b = gf.ascent) != null ? _b : 0.9 * gf.unitsPerEm;
           const paint = paintOf(s);
           for (let i = 0; i < content.length; i++) {
             const ch = content.charAt(i);
             const g = gf.glyphs[ch];
-            if (g && g.d) {
+            if (g && g.pathData) {
               const glyphAdv = g.width * scale;
-              cells.push({ glyphD: g.d, widthEm: g.width, scale, paint, midBase: adv + glyphAdv / 2 });
+              cells.push({ glyphD: g.pathData, widthEm: g.width, scale, paint, midBase: adv + glyphAdv / 2 });
               adv += glyphAdv;
             } else if (/\S/.test(ch)) {
               const wEm = g && g.width > 0 ? g.width : MISSING_GLYPH_ADVANCE_EM * gf.unitsPerEm;
@@ -4829,13 +5097,13 @@ var PixodeskAnimator = (() => {
     return [scale * cos, scale * sin, -scale * sin, scale * cos, x - scale * cos * hw - perp * sin, y - scale * sin * hw + perp * cos];
   }
   function alongPathNodeOffsets(node) {
-    var _a, _b, _c;
+    var _a2, _b, _c;
     return {
-      along: ((_a = parseLen(node.x)) != null ? _a : 0) + ((_b = parseLen(node.dx)) != null ? _b : 0),
+      along: ((_a2 = parseLen(node.x)) != null ? _a2 : 0) + ((_b = parseLen(node.dx)) != null ? _b : 0),
       perp: (_c = parseLen(node.dy)) != null ? _c : 0
     };
   }
-  function materialiseGlyphTextAlongPath(node, pathD, startOffset, opts, textLength, pathOverflow) {
+  function materializeGlyphTextAlongPath(node, pathD, startOffset, opts, textLength, pathOverflow) {
     const { glyphs, create = jsonElementFactory, warnings } = opts;
     const sampler = pathD ? createPathSampler(pathD) : null;
     if (!sampler) {
@@ -4871,7 +5139,7 @@ var PixodeskAnimator = (() => {
     return toGroup(node, buildPaths(placements, create, warnings), create);
   }
   function numTrackOf(raw) {
-    var _a;
+    var _a2;
     const r = readAnimatable(raw);
     if (r.kind === "animated" /* Animated */ && r.keyframes.length >= 2) {
       const kfs = [...r.keyframes].sort((k1, k2) => (Number(k1.time) || 0) - (Number(k2.time) || 0));
@@ -4894,7 +5162,7 @@ var PixodeskAnimator = (() => {
         }
       };
     }
-    const v = r.kind === "animated" /* Animated */ ? Number((_a = r.keyframes[0]) == null ? void 0 : _a.value) || 0 : r.kind === "static" /* Static */ ? Number(r.value) || 0 : 0;
+    const v = r.kind === "animated" /* Animated */ ? Number((_a2 = r.keyframes[0]) == null ? void 0 : _a2.value) || 0 : r.kind === "static" /* Static */ ? Number(r.value) || 0 : 0;
     return { animated: false, times: [], at: () => v };
   }
   function mergeTrackTimes(a, b) {
@@ -4914,8 +5182,8 @@ var PixodeskAnimator = (() => {
     const onPath = (dist) => dist >= 0 && dist <= sampler.totalLength;
     const out = [];
     for (const c of cells) {
-      const centred = [c.scale, 0, 0, c.scale, -c.scale * (c.widthEm / 2), 0];
-      const d = transformPathData(c.glyphD, centred);
+      const centered = [c.scale, 0, 0, c.scale, -c.scale * (c.widthEm / 2), 0];
+      const d = transformPathData(c.glyphD, centered);
       const sampleKf = (dist, time) => {
         const { x, y, angle } = sampler.sampleAtDistance(dist);
         const cos = Math.cos(angle), sin = Math.sin(angle);
@@ -4970,7 +5238,7 @@ var PixodeskAnimator = (() => {
     return p;
   }
   function missingGlyphProps(isMissing) {
-    return isMissing ? { class: MISSING_GLYPH_CLASS_NAME } : {};
+    return isMissing ? { [CLASS_ATTR]: MISSING_GLYPH_CLASS_NAME } : {};
   }
   function buildPaths(placements, create, warnings) {
     if (!placements.length) {
@@ -5010,20 +5278,20 @@ var PixodeskAnimator = (() => {
   function applyTextGlyphsEffect(node, fx, ctx) {
     if (!(fx == null ? void 0 : fx.useGlyphs)) return node;
     if (!ctx.glyphs) {
-      ctx.warnings.push("textGlyphs: no definitions.glyphs \u2014 left as native <text>");
+      ctx.warnings.push("textGlyphs: no definitions.fonts \u2014 left as native <text>");
       return node;
     }
-    return materialiseGlyphTextHorizontal(node, { glyphs: ctx.glyphs, warnings: ctx.warnings });
+    return materializeGlyphTextHorizontal(node, { glyphs: ctx.glyphs, warnings: ctx.warnings });
   }
   function applyTextGlyphsAlongPath(node, ctx, pathD, startOffset, textLength, pathOverflow) {
     if (!ctx.glyphs) {
-      ctx.warnings.push("textGlyphs: no definitions.glyphs");
+      ctx.warnings.push("textGlyphs: no definitions.fonts");
       return null;
     }
-    return materialiseGlyphTextAlongPath(node, pathD, startOffset, { glyphs: ctx.glyphs, warnings: ctx.warnings }, textLength, pathOverflow);
+    return materializeGlyphTextAlongPath(node, pathD, startOffset, { glyphs: ctx.glyphs, warnings: ctx.warnings }, textLength, pathOverflow);
   }
 
-  // ../svg-animator-core/src/effects/strokeTrimEffect.ts
+  // ../svg-animator-core/src/effects/stroke/strokeTrimEffect.ts
   function applyStrokeTrimEffect(node, strokeTrim, ctx) {
     if (!strokeTrim) return node;
     const combined = strokeTrim.subPaths === PxStrokeTrimSubPaths.combined;
@@ -5159,12 +5427,11 @@ var PixodeskAnimator = (() => {
     ];
   }
   function readScalarValues(r) {
-    var _a;
     if (r.kind === "absent" /* Absent */) return [];
     if (r.kind === "static" /* Static */) return [r.value];
     const out = [];
     for (const kf of r.keyframes) {
-      const v = (_a = kf.value) != null ? _a : kf.v;
+      const v = kfValue(kf);
       if (typeof v === "number") out.push(v);
     }
     return out;
@@ -5174,14 +5441,11 @@ var PixodeskAnimator = (() => {
     if (read.kind === "static" /* Static */) return { kind: "static" /* Static */, value: map(read.value) };
     return {
       kind: "animated" /* Animated */,
-      keyframes: read.keyframes.map((kf) => {
-        var _a, _b, _c, _d;
-        return {
-          time: (_b = (_a = kf.time) != null ? _a : kf.t) != null ? _b : 0,
-          value: map((_c = kf.value) != null ? _c : kf.v),
-          easing: (_d = kf.easing) != null ? _d : kf.e
-        };
-      }),
+      keyframes: read.keyframes.map((kf) => ({
+        time: kfTime(kf),
+        value: map(kfValue(kf)),
+        easing: kfEasing(kf)
+      })),
       loop: read.loop
     };
   }
@@ -5191,7 +5455,6 @@ var PixodeskAnimator = (() => {
   }
   var OPACITY_STEP_MS = 10;
   function computeOpacityFromRange(rangeRead) {
-    var _a, _b, _c, _d, _e, _f;
     const hide = (v) => v[0] === v[1];
     if (rangeRead.kind === "absent" /* Absent */) return void 0;
     if (rangeRead.kind === "static" /* Static */) return hide(rangeRead.value) ? { kind: "static" /* Static */, value: 0 } : void 0;
@@ -5199,7 +5462,7 @@ var PixodeskAnimator = (() => {
     let anyHide = false;
     let allHide = true;
     for (const kf of kfs) {
-      if (hide((_a = kf.value) != null ? _a : kf.v)) anyHide = true;
+      if (hide(kfValue(kf))) anyHide = true;
       else allHide = false;
     }
     if (!anyHide) return void 0;
@@ -5209,10 +5472,10 @@ var PixodeskAnimator = (() => {
       const kf = kfs[i];
       const prevKf = i > 0 ? kfs[i - 1] : void 0;
       const nextKf = i < kfs.length - 1 ? kfs[i + 1] : void 0;
-      const t = (_c = (_b = kf.time) != null ? _b : kf.t) != null ? _c : 0;
-      const thisHide = hide((_d = kf.value) != null ? _d : kf.v);
-      const prevHide = prevKf ? thisHide && hide((_e = prevKf.value) != null ? _e : prevKf.v) : thisHide;
-      const nextHide = nextKf ? thisHide && hide((_f = nextKf.value) != null ? _f : nextKf.v) : thisHide;
+      const t = kfTime(kf);
+      const thisHide = hide(kfValue(kf));
+      const prevHide = prevKf ? thisHide && hide(kfValue(prevKf)) : thisHide;
+      const nextHide = nextKf ? thisHide && hide(kfValue(nextKf)) : thisHide;
       if (prevHide && !nextHide) {
         out.push({ time: t, value: 0 });
         out.push({ time: t + OPACITY_STEP_MS, value: 1 });
@@ -5227,14 +5490,11 @@ var PixodeskAnimator = (() => {
   function readRangeWithCrossings(raw) {
     const r = readAnimatable(raw);
     if (r.kind !== "animated" /* Animated */) return r;
-    const kfs = r.keyframes.map((kf) => {
-      var _a, _b, _c, _d;
-      return {
-        time: (_b = (_a = kf.time) != null ? _a : kf.t) != null ? _b : 0,
-        value: (_c = kf.value) != null ? _c : kf.v,
-        easing: (_d = kf.easing) != null ? _d : kf.e
-      };
-    });
+    const kfs = r.keyframes.map((kf) => ({
+      time: kfTime(kf),
+      value: kfValue(kf),
+      easing: kfEasing(kf)
+    }));
     const hasReverse = kfs.some((kf) => kf.value[0] > kf.value[1]);
     if (!hasReverse) {
       return {
@@ -5331,20 +5591,20 @@ var PixodeskAnimator = (() => {
     return total;
   }
   function segmentLength(path, from, to) {
-    var _a, _b, _c, _d;
+    var _a2, _b, _c, _d;
     const v = path.v;
     const p0 = v[from];
     const p3 = v[to];
-    const p1 = (_b = (_a = path.o) == null ? void 0 : _a[from]) != null ? _b : p0;
+    const p1 = (_b = (_a2 = path.o) == null ? void 0 : _a2[from]) != null ? _b : p0;
     const p2 = (_d = (_c = path.i) == null ? void 0 : _c[to]) != null ? _d : p3;
     const lut = bezier2D_arcLengthLUT(p0, p1, p2, p3);
     return lut.ds[lut.ds.length - 1];
   }
   var ARC_KAPPA = 0.5522847498307936;
   function shapeToPathD(node) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (node.type === "rect") {
-      const x = Number((_a = node.x) != null ? _a : 0), y = Number((_b = node.y) != null ? _b : 0);
+      const x = Number((_a2 = node.x) != null ? _a2 : 0), y = Number((_b = node.y) != null ? _b : 0);
       const w = Number((_c = node.width) != null ? _c : 0), h = Number((_d = node.height) != null ? _d : 0);
       return "M" + (x + w) + "," + y + "L" + (x + w) + "," + (y + h) + "L" + x + "," + (y + h) + "L" + x + "," + y + "L" + (x + w) + "," + y + "z";
     }
@@ -5362,7 +5622,7 @@ var PixodeskAnimator = (() => {
 
   // ../svg-animator-core/src/effects/PlayerEffectsUtil.ts
   function applyPlayerEffects(root) {
-    var _a, _b;
+    var _a2, _b;
     const ctx = {
       defs: [],
       warnings: [],
@@ -5373,8 +5633,8 @@ var PixodeskAnimator = (() => {
       maskAncestorChains: /* @__PURE__ */ new Map(),
       // Resolved engine: `frames` ONLY when explicitly set; auto/waapi/unset →
       // waapi (we're not 100% sure it's frames, and CSS/WAAPI need the inline form).
-      engine: ((_a = getAnimatorConfig(root)) == null ? void 0 : _a.mode) === PxAnimatorMode.frames ? PxAnimatorEngine.frames : PxAnimatorEngine.waapi,
-      glyphs: (_b = getDefs(root)) == null ? void 0 : _b.glyphs
+      engine: resolveTimelineEngine((_a2 = getAnimatorConfig(root)) == null ? void 0 : _a2.engine),
+      glyphs: (_b = getDefs(root)) == null ? void 0 : _b.fonts
     };
     const working = clone(root);
     indexById(working, ctx.idMap);
@@ -5397,7 +5657,7 @@ var PixodeskAnimator = (() => {
     let consumedByGlyphs = false;
     if (text == null ? void 0 : text.useGlyphs) {
       if (textPath) {
-        const pathD = typeof textPath.path === "string" ? textPath.path : void 0;
+        const pathD = typeof textPath.pathData === "string" ? textPath.pathData : void 0;
         const glyphed = applyTextGlyphsAlongPath(n, ctx, pathD, textPath.startOffset, textPath.textLength, textPath.pathOverflow);
         if (glyphed) {
           n = glyphed;
@@ -5430,27 +5690,7 @@ var PixodeskAnimator = (() => {
     return node;
   }
 
-  // ../svg-animator-core/src/PxOffsetPathMaterialiser.ts
-  var kfTime = (kf) => {
-    var _a, _b;
-    return (_b = (_a = kf.t) != null ? _a : kf.time) != null ? _b : 0;
-  };
-  var kfValue = (kf) => {
-    var _a;
-    return (_a = kf.v) != null ? _a : kf.value;
-  };
-  var kfEasing = (kf) => {
-    var _a;
-    return (_a = kf.e) != null ? _a : kf.easing;
-  };
-  var kfTangentIn = (kf) => {
-    var _a;
-    return (_a = kf.tangentIn) != null ? _a : kf.ti;
-  };
-  var kfTangentOut = (kf) => {
-    var _a;
-    return (_a = kf.tangentOut) != null ? _a : kf.to;
-  };
+  // ../svg-animator-core/src/materialize/PxOffsetPathMaterializer.ts
   function cubicAt(p0, c1, c2, p1, t) {
     const u = 1 - t;
     const a = u * u * u, b = 3 * u * u * t, c = 3 * u * t * t, d = t * t * t;
@@ -5474,7 +5714,7 @@ var PixodeskAnimator = (() => {
     return Object.is(r, -0) ? "0" : String(r);
   };
   function buildOffsetPath(propAnim) {
-    var _a, _b, _c;
+    var _a2, _b, _c;
     if (propAnim.alongPathMode !== "offsetPath") return void 0;
     const kfs = propAnim.keyframes;
     if (!kfs || kfs.length < 2) return void 0;
@@ -5487,7 +5727,7 @@ var PixodeskAnimator = (() => {
       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 = (_a = v == null ? void 0 : v.origin) != null ? _a : [0, 0];
+      const o = (_a2 = v == null ? void 0 : v.origin) != null ? _a2 : [0, 0];
       if (o[0] !== anchor[0] || o[1] !== anchor[1]) return void 0;
       points.push([tr[0] + anchor[0], tr[1] + anchor[1]]);
     }
@@ -5516,9 +5756,9 @@ var PixodeskAnimator = (() => {
     }
     return { pathStr: d, distanceKfs, autoOrient: !!propAnim.autoOrient, anchor };
   }
-  function materialiseOffsetPathsInTree(root) {
+  function materializeOffsetPathsInTree(root) {
     const walk = (node) => {
-      var _a;
+      var _a2;
       let out = node;
       const anim = node.animate;
       const transform = anim == null ? void 0 : anim["transform"];
@@ -5526,16 +5766,16 @@ var PixodeskAnimator = (() => {
         const built = buildOffsetPath(transform);
         if (built) {
           const newAnimate = __spreadValues({}, anim);
-          delete newAnimate["transform"];
+          delete newAnimate[TRANSFORM_ATTR];
           const distance = { keyframes: built.distanceKfs };
           if (transform.loop !== void 0) distance.loop = transform.loop;
-          newAnimate["offsetDistance"] = distance;
+          newAnimate[OFFSET_DISTANCE_ATTR] = distance;
           const staticTr = node.transform;
           let newTransform = staticTr;
           if (staticTr && typeof staticTr === "object") {
             const t = __spreadValues({}, staticTr);
-            delete t["translate"];
-            delete t["origin"];
+            delete t[TRANSFORM_PART.translate];
+            delete t[TRANSFORM_PART.origin];
             newTransform = Object.keys(t).length ? t : void 0;
           }
           out = __spreadProps(__spreadValues({}, node), {
@@ -5551,7 +5791,7 @@ var PixodeskAnimator = (() => {
           else delete out.transform;
         }
       }
-      if ((_a = out.children) == null ? void 0 : _a.length) {
+      if ((_a2 = out.children) == null ? void 0 : _a2.length) {
         const children = out.children.map(walk);
         if (children.some((c, i) => c !== out.children[i])) out = __spreadProps(__spreadValues({}, out), { children });
       }
@@ -5560,16 +5800,16 @@ var PixodeskAnimator = (() => {
     return walk(root);
   }
 
-  // ../svg-animator-core/src/PxAnimatorMaterialiseAll.ts
-  function materialiseAllInTree(doc, engine, opts) {
-    var _a, _b;
+  // ../svg-animator-core/src/materialize/PxAnimatorMaterializeAll.ts
+  function materializeAllInTree(doc, engine, opts) {
+    var _a2, _b;
     let root = applyPlayerEffects(doc).root;
-    root = materialiseOffsetPathsInTree(root);
-    const duration = (_b = (_a = getAnimatorConfig(root)) == null ? void 0 : _a.duration) != null ? _b : DEFAULT_DURATION_MS;
-    root = materialiseInternalLoopsInTree(root, duration);
-    if (engine === PxAnimatorEngine.waapi) {
-      root = materialiseMotionPathsInTree(root, opts == null ? void 0 : opts.motionPath);
-      root = materialiseAnimatedUseInstances(root);
+    root = materializeOffsetPathsInTree(root);
+    const duration = (_b = (_a2 = getAnimatorConfig(root)) == null ? void 0 : _a2.duration) != null ? _b : DEFAULT_DURATION_MS;
+    root = materializeInternalLoopsInTree(root, duration);
+    if (engine === PxTimelineEngine.native) {
+      root = materializeMotionPathsInTree(root, opts == null ? void 0 : opts.motionPath);
+      root = materializeAnimatedUseInstances(root);
       root = pruneUnreferencedDefs(root);
     }
     return root;
@@ -5577,9 +5817,9 @@ var PixodeskAnimator = (() => {
   function pruneUnreferencedDefs(root) {
     const stripHash3 = (h) => h.startsWith("#") ? h.slice(1) : h;
     const walk = (n, fn) => {
-      var _a;
+      var _a2;
       fn(n);
-      (_a = n.children) == null ? void 0 : _a.forEach((c) => walk(c, fn));
+      (_a2 = n.children) == null ? void 0 : _a2.forEach((c) => walk(c, fn));
     };
     let changed = true;
     while (changed) {
@@ -5604,7 +5844,41 @@ var PixodeskAnimator = (() => {
     return root;
   }
 
-  // ../svg-animator-core/src/PxFrameLoop.ts
+  // ../svg-animator-core/src/playback/PxPlaybackTime.ts
+  var PX_RATE_REJECTED = "setPlaybackRate: rate must be finite and non-zero";
+  function isValidPlaybackRate(rate) {
+    return Number.isFinite(rate) && rate !== 0;
+  }
+  function seekCeilingMs(durationMs, iterations) {
+    if (!(durationMs > 0)) return 0;
+    if (iterations === Infinity) return Infinity;
+    return durationMs * (iterations > 0 ? iterations : 1);
+  }
+  function progressSpanMs(durationMs, iterations) {
+    if (!(durationMs > 0)) return 0;
+    if (iterations === Infinity) return durationMs;
+    return durationMs * (iterations > 0 ? iterations : 1);
+  }
+  function clampSeekMs(timeMs, ceilingMs) {
+    if (Number.isNaN(timeMs) || timeMs < 0) return 0;
+    if (Number.isFinite(ceilingMs)) return timeMs > ceilingMs ? ceilingMs : timeMs;
+    return Number.isFinite(timeMs) ? timeMs : 0;
+  }
+  function timeToProgress(timeMs, durationMs, iterations) {
+    const span = progressSpanMs(durationMs, iterations);
+    if (!(span > 0) || !Number.isFinite(timeMs)) return 0;
+    if (timeMs <= 0) return 0;
+    if (iterations === Infinity) return timeMs % span / span;
+    return timeMs >= span ? 1 : timeMs / span;
+  }
+  function progressToTimeMs(progress, durationMs, iterations) {
+    const span = progressSpanMs(durationMs, iterations);
+    if (!(span > 0) || !Number.isFinite(progress)) return 0;
+    if (progress <= 0) return 0;
+    return progress >= 1 ? span : progress * span;
+  }
+
+  // ../svg-animator-core/src/playback/PxFrameLoop.ts
   function requestFrame(cb) {
     const g = globalThis;
     if (typeof g.requestAnimationFrame === "function") return g.requestAnimationFrame(cb);
@@ -5619,9 +5893,9 @@ var PixodeskAnimator = (() => {
     g.clearTimeout(handle);
   }
   function createBasicFrameLoopAnimator(doc, adapter, callbacks) {
-    var _a;
+    var _a2;
     const config = getAnimatorConfig(doc) || {};
-    const bindings = getNormalisedBindings(doc, PxAnimatorEngine.frames);
+    const bindings = getNormalizedBindings(doc, PxTimelineEngine.js);
     const _iterations = config.iterations;
     let iterations = 1;
     if (typeof _iterations === "number") iterations = _iterations || 1;
@@ -5630,7 +5904,7 @@ var PixodeskAnimator = (() => {
     const duration = +(config.duration || DEFAULT_DURATION_MS);
     const totalDuration = duration && iterations ? duration * (iterations === Infinity ? Infinity : iterations) : duration ? (iterations != null ? iterations : 1) * duration : 0;
     const direction = config.direction || "normal";
-    const fill = (_a = config.fill) != null ? _a : "forwards";
+    const fill = (_a2 = config.fill) != null ? _a2 : "forwards";
     const fillsForwards = fill === "forwards" || fill === "both";
     const fillsBackwards = fill === "backwards" || fill === "both";
     let timerId = null;
@@ -5692,7 +5966,7 @@ var PixodeskAnimator = (() => {
       }
     }
     const tick = () => {
-      var _a2, _b;
+      var _a3, _b;
       if (!adapter.isConnected()) {
         pauseAnim();
         return;
@@ -5708,7 +5982,7 @@ var PixodeskAnimator = (() => {
         renderFrame(0);
         if (!finishCalled) {
           finishCalled = true;
-          (_a2 = callbacks == null ? void 0 : callbacks.onFinish) == null ? void 0 : _a2.call(callbacks);
+          (_a3 = callbacks == null ? void 0 : callbacks.onFinish) == null ? void 0 : _a3.call(callbacks);
         }
         return;
       }
@@ -5800,17 +6074,17 @@ var PixodeskAnimator = (() => {
       }
     };
     const cancelAnim = () => {
-      var _a2;
+      var _a3;
       pauseAnim();
       timeBeforeLastStartMs = 0;
       lastStartedTs = 0;
       playing = false;
       finishCalled = false;
       renderFrame(timeBeforeLastStartMs);
-      (_a2 = callbacks == null ? void 0 : callbacks.onCancel) == null ? void 0 : _a2.call(callbacks);
+      (_a3 = callbacks == null ? void 0 : callbacks.onCancel) == null ? void 0 : _a3.call(callbacks);
     };
     const finishAnim = (callOnFinish = true) => {
-      var _a2;
+      var _a3;
       if (Number.isFinite(totalDuration)) {
         timeBeforeLastStartMs = totalDuration;
       } else {
@@ -5825,7 +6099,7 @@ var PixodeskAnimator = (() => {
       renderFrame(fillsForwards ? timeBeforeLastStartMs : 0);
       if (callOnFinish && !finishCalled) {
         finishCalled = true;
-        (_a2 = callbacks == null ? void 0 : callbacks.onFinish) == null ? void 0 : _a2.call(callbacks);
+        (_a3 = callbacks == null ? void 0 : callbacks.onFinish) == null ? void 0 : _a3.call(callbacks);
       }
     };
     const api = {
@@ -5835,14 +6109,14 @@ var PixodeskAnimator = (() => {
         return _isPlaying();
       },
       "play": () => {
-        var _a2;
+        var _a3;
         startAnim();
-        (_a2 = callbacks == null ? void 0 : callbacks.onPlay) == null ? void 0 : _a2.call(callbacks);
+        (_a3 = callbacks == null ? void 0 : callbacks.onPlay) == null ? void 0 : _a3.call(callbacks);
       },
       "pause": () => {
-        var _a2;
+        var _a3;
         pauseAnim();
-        (_a2 = callbacks == null ? void 0 : callbacks.onPause) == null ? void 0 : _a2.call(callbacks);
+        (_a3 = callbacks == null ? void 0 : callbacks.onPause) == null ? void 0 : _a3.call(callbacks);
       },
       "cancel": () => {
         cancelAnim();
@@ -5851,8 +6125,8 @@ var PixodeskAnimator = (() => {
         finishAnim(true);
       },
       "setPlaybackRate": (rate) => {
-        if (!isFinite(rate) || rate === 0) {
-          console.warn("setPlaybackRate: rate must be finite and non-zero");
+        if (!isValidPlaybackRate(rate)) {
+          console.warn(PX_RATE_REJECTED);
           return;
         }
         let current = getRawAnimTime();
@@ -5866,29 +6140,272 @@ var PixodeskAnimator = (() => {
         return getAnimCurrentTime();
       },
       "setCurrentTime": (newTime) => {
-        if (newTime < 0) newTime = 0;
-        if (Number.isFinite(totalDuration) && newTime > totalDuration) newTime = totalDuration;
+        newTime = clampSeekMs(newTime, totalDuration);
         timeBeforeLastStartMs = newTime;
         if (playing) lastStartedTs = Date.now();
         if (!Number.isFinite(totalDuration) || newTime < totalDuration) finishCalled = false;
         renderFrame(getAnimCurrentTime());
       },
+      "getCurrentProgress": () => timeToProgress(getAnimCurrentTime(), duration, iterations),
+      "setCurrentProgress": (progress) => {
+        api.setCurrentTime(progressToTimeMs(progress, duration, iterations));
+      },
       "destroy": () => {
-        var _a2;
+        var _a3;
         api.cancel();
-        (_a2 = callbacks == null ? void 0 : callbacks.onRemove) == null ? void 0 : _a2.call(callbacks);
+        (_a3 = callbacks == null ? void 0 : callbacks.onRemove) == null ? void 0 : _a3.call(callbacks);
       }
     };
     return api;
   }
 
-  // src/PxAnimatorTriggers.ts
-  function setupAnimationTriggers(api, config) {
-    const { startOn, outAction = "continue", scrollIntoViewThreshold = 0 } = config;
+  // ../svg-animator-core/src/playback/PxDiagnostics.ts
+  var PxDiagnosticKind = {
+    /** The document is wrong — regenerate or repair the file. */
+    document: "document",
+    /** The page or app cannot provide what the document asks for — fix the mount. */
+    host: "host",
+    /** The platform cannot do it and the player degraded — usually nothing to fix. */
+    platform: "platform",
+    /** The call is wrong or self-contradictory — fix the options or props you passed. */
+    usage: "usage",
+    /** The player failed where it did not expect to — report it to us. */
+    internal: "internal"
+  };
+  function asError(error) {
+    return typeof error === "string" ? new Error(error) : error;
+  }
+  function isSilenced(silent, kind) {
+    if (!silent) return false;
+    return silent === true || silent.includes(kind);
+  }
+  function createDiagnostics(config, prefix) {
+    const tag = prefix ? prefix + " " : "";
+    return {
+      warn: (kind, message, detail) => {
+        if (config == null ? void 0 : config.onWarn) {
+          config.onWarn({ kind, message, detail });
+          return;
+        }
+        if (isSilenced(config == null ? void 0 : config.silent, kind)) return;
+        const line = tag + kind + ": " + message;
+        if (detail === void 0) console.warn(line);
+        else console.warn(line, detail);
+      },
+      error: (kind, error) => {
+        const err = asError(error);
+        if (config == null ? void 0 : config.onError) {
+          config.onError({ kind, message: err.message, error: err });
+          return;
+        }
+        if (isSilenced(config == null ? void 0 : config.silent, kind)) return;
+        console.error(tag + kind + ": " + err.message);
+      }
+    };
+  }
+
+  // ../svg-animator-core/src/playback/PxAnimatorConfigPatch.ts
+  var FLAT_ONLY_KEYS = [
+    "timelineSource",
+    "scroll",
+    "trigger",
+    "delay",
+    "iterations",
+    "direction",
+    "fill",
+    "resetOnFinish",
+    "duration",
+    "mode",
+    "frameRate"
+  ];
+  var CONTENT_KEYS = ["definitions", "animateById"];
+  var isPlainObject = (v) => !!v && typeof v === "object" && !Array.isArray(v);
+  var timelineTypeOf = (t) => isPlainObject(t) && typeof t.type === "string" ? t.type : "time";
+  var isScrollish = (type) => type === "scroll" || type === "view";
+  function mergePlain(base, patch) {
+    const out = isPlainObject(base) ? __spreadValues({}, base) : {};
+    for (const key of Object.keys(patch)) {
+      const value = patch[key];
+      if (value === null) {
+        delete out[key];
+        continue;
+      }
+      if (isPlainObject(value)) {
+        out[key] = mergePlain(out[key], value);
+        continue;
+      }
+      out[key] = value;
+    }
+    return out;
+  }
+  function mergeTimeline(base, patch, warn) {
+    const baseType = timelineTypeOf(base);
+    const patchNamesType = isPlainObject(patch) && typeof patch.type === "string";
+    const patchType = patchNamesType ? String(patch.type) : baseType;
+    let merged;
+    if (patchType !== baseType) {
+      const carried = {};
+      if (isPlainObject(base)) {
+        for (const k of PX_TIMELINE_SHARED_KEYS) {
+          if (base[k] !== void 0) carried[k] = base[k];
+        }
+      }
+      merged = mergePlain(carried, patch);
+    } else {
+      merged = mergePlain(base, patch);
+    }
+    if (isScrollish(patchType)) {
+      for (const k of PX_TIME_ONLY_TIMELINE_KEYS) {
+        if (merged[k] === void 0) continue;
+        warn("animator.timeline." + k + ": no slot on a '" + patchType + "' timeline \u2014 dropped");
+        delete merged[k];
+      }
+      if (merged.iterations === "infinite") {
+        warn("animator.timeline.iterations: 'infinite' cannot map onto a scroll range \u2014 dropped");
+        delete merged.iterations;
+      }
+    }
+    return merged;
+  }
+  function foldTimelineOverride(timeline, shortcuts) {
+    let base;
+    if (typeof timeline === "string") {
+      try {
+        base = JSON.parse(timeline);
+      } catch (e) {
+        console.warn("timeline override: not valid JSON \u2014 ignored", e);
+        base = void 0;
+      }
+    } else {
+      base = timeline != null ? timeline : void 0;
+    }
+    const { duration, delay, iterations, startOn } = shortcuts;
+    if (duration === void 0 && delay === void 0 && iterations === void 0 && startOn === void 0) {
+      return base === void 0 ? void 0 : { timeline: base };
+    }
+    const out = isPlainObject(base) ? __spreadValues({}, base) : {};
+    if (duration !== void 0) out.duration = duration;
+    if (delay !== void 0) out.delay = delay;
+    if (iterations !== void 0) out.iterations = iterations;
+    if (startOn !== void 0) {
+      out.trigger = __spreadProps(__spreadValues({}, out.trigger), { startOn });
+    }
+    return { timeline: out };
+  }
+  function mergeAnimatorConfig(base, patch) {
+    const warnings = [];
+    const warn = (m) => warnings.push(m);
+    if (patch === null) return { config: void 0, warnings };
+    if (!isPlainObject(patch) || Object.keys(patch).length === 0) {
+      return { config: base, warnings };
+    }
+    const flatInBase = isPlainObject(base) ? FLAT_ONLY_KEYS.filter((k) => base[k] !== void 0) : [];
+    if (flatInBase.length) {
+      warn("animator: the base carries the flat runtime spelling (" + flatInBase.join(", ") + "); the patch merges the wire spelling only");
+    }
+    const out = isPlainObject(base) ? __spreadValues({}, base) : {};
+    for (const key of Object.keys(patch)) {
+      const value = patch[key];
+      if (value === null) {
+        delete out[key];
+        continue;
+      }
+      if (key === "timeline") {
+        out.timeline = isPlainObject(value) ? mergeTimeline(out.timeline, value, warn) : value;
+        continue;
+      }
+      if (isPlainObject(value)) {
+        out[key] = mergePlain(out[key], value);
+        continue;
+      }
+      out[key] = value;
+    }
+    return { config: out, warnings };
+  }
+  function applyAnimatorConfig(doc, patch, opts) {
+    var _a2, _b;
+    const reset = !!(opts == null ? void 0 : opts.resetDefaults);
+    if (!doc || (patch === void 0 || !reset && (patch === null || !isPlainObject(patch) || !Object.keys(patch).length))) {
+      return { doc, warnings: [] };
+    }
+    const anyDoc = doc;
+    const atRoot = isPlainObject(anyDoc.animator);
+    const atMeta = !atRoot && isPlainObject((_a2 = anyDoc.meta) == null ? void 0 : _a2.animator);
+    const current = atRoot ? anyDoc.animator : atMeta ? anyDoc.meta.animator : void 0;
+    const warnings = [];
+    if (atRoot && isPlainObject((_b = anyDoc.meta) == null ? void 0 : _b.animator)) {
+      warnings.push("animator: doc.meta.animator is shadowed by doc.animator and was not patched");
+    }
+    let base = current;
+    if (reset) {
+      const kept = {};
+      for (const k of CONTENT_KEYS) {
+        if (isPlainObject(current) && current[k] !== void 0) kept[k] = current[k];
+      }
+      base = kept;
+    }
+    const merged = mergeAnimatorConfig(base, patch != null ? patch : {});
+    warnings.push(...merged.warnings);
+    if (merged.config === current) return { doc, warnings };
+    if (atMeta) {
+      return {
+        doc: __spreadProps(__spreadValues({}, anyDoc), { meta: __spreadProps(__spreadValues({}, anyDoc.meta), { animator: merged.config }) }),
+        warnings
+      };
+    }
+    return { doc: __spreadProps(__spreadValues({}, anyDoc), { animator: merged.config }), warnings };
+  }
+
+  // ../svg-animator-core/src/format/PxDocumentDiagnostic.ts
+  var MAX_REPORTED = 6;
+  function diagnoseDocument(doc) {
+    try {
+      return { problems: validateDocument(doc) };
+    } catch (e) {
+      return { problems: [] };
+    }
+  }
+  function reportDocumentDiagnostics(doc, where) {
+    const { problems } = diagnoseDocument(doc);
+    if (!problems.length) return;
+    const shown = problems.slice(0, MAX_REPORTED);
+    const more = problems.length - shown.length;
+    console.warn(
+      where + ": this document does not match the animation schema in " + problems.length + " place" + (problems.length === 1 ? "" : "s") + ".\n" + shown.map((p) => "  - " + p).join("\n") + (more > 0 ? "\n  \u2026 and " + more + " more" : "") + "\n\nIf you did not author these keys, the usual cause is a build that MANGLES PROPERTY NAMES. An animation document is data loaded at runtime, so renaming the property reads inside the player stops them matching the keys in the JSON, and the animation silently does nothing. Feed the published reserved-name list to your minifier \u2014 @pixodesk/svg-animator-web/mangle-reserved.json \u2014 see docs/library/minification.md."
+    );
+  }
+
+  // src/shared/PxAnimatorCallbacks.ts
+  function toEngineCallbacks(inline) {
+    const { onPlay, onPause, onCancel, onFinish, onRemove, onStop, onWarn, onError, silent } = inline != null ? inline : {};
+    const withStop = (own) => own || onStop ? () => {
+      own == null ? void 0 : own();
+      onStop == null ? void 0 : onStop();
+    } : void 0;
+    return {
+      onPlay,
+      onPause: withStop(onPause),
+      onCancel: withStop(onCancel),
+      onFinish: withStop(onFinish),
+      onRemove: withStop(onRemove),
+      onWarn,
+      onError,
+      silent
+    };
+  }
+
+  // src/triggers/PxAnimatorTriggers.ts
+  function setupAnimationTriggers(api, config, diag) {
+    const report = diag != null ? diag : createDiagnostics(void 0, "[PxAnimator]");
+    const cleanups = [];
+    const dispose = () => {
+      for (const undo of cleanups.splice(0)) undo();
+    };
+    const { startOn, outAction, scrollIntoViewThreshold } = resolveTrigger(config);
     const root = api.getRootElement();
     if (!root) {
-      console.warn("setupAnimationTriggers: No root element found for animation.");
-      return api;
+      report.warn(PxDiagnosticKind.host, "setupAnimationTriggers: No root element found for animation.");
+      return dispose;
     }
     let reversed = false;
     const start = () => {
@@ -5923,6 +6440,7 @@ var PixodeskAnimator = (() => {
           startHandler();
         } else {
           window.addEventListener("load", startHandler, { once: true });
+          cleanups.push(() => window.removeEventListener("load", startHandler));
         }
         break;
       }
@@ -5937,6 +6455,10 @@ var PixodeskAnimator = (() => {
         };
         root.addEventListener("mouseenter", mouseOverHandler);
         root.addEventListener("mouseleave", mouseOutHandler);
+        cleanups.push(() => {
+          root.removeEventListener("mouseenter", mouseOverHandler);
+          root.removeEventListener("mouseleave", mouseOutHandler);
+        });
         break;
       }
       case "click": {
@@ -5948,16 +6470,17 @@ var PixodeskAnimator = (() => {
           }
         };
         root.addEventListener("click", clickHandler);
+        cleanups.push(() => root.removeEventListener("click", clickHandler));
         break;
       }
       case "scrollIntoView": {
         const effectiveRatio = (entry) => {
-          var _a, _b;
+          var _a2, _b;
           const target = entry.boundingClientRect;
           const visible = entry.intersectionRect;
           if (!(target == null ? void 0 : target.height) || !visible) return entry.intersectionRatio;
           const live = typeof window !== "undefined" && window.innerHeight ? window.innerHeight : Infinity;
-          const declared = (_b = (_a = entry.rootBounds) == null ? void 0 : _a.height) != null ? _b : Infinity;
+          const declared = (_b = (_a2 = entry.rootBounds) == null ? void 0 : _a2.height) != null ? _b : Infinity;
           const viewport = Math.min(live, declared);
           const denom = Math.min(target.height, Number.isFinite(viewport) ? viewport : target.height);
           return denom > 0 ? visible.height / denom : entry.intersectionRatio;
@@ -5979,48 +6502,55 @@ var PixodeskAnimator = (() => {
           { threshold: thresholdSteps }
         );
         observer.observe(root);
+        cleanups.push(() => observer.disconnect());
         break;
       }
       case "programmatic":
         break;
     }
-    return api;
+    return dispose;
   }
 
-  // src/PxAnimatorFrameLoop.ts
+  // src/engines/PxAnimatorFrameLoop.ts
   function getSelector(id) {
     return "#" + id;
   }
   function createFrameLoopAnimator(doc, adapter, callbacks, rootElement) {
+    var _a2;
     const config = getAnimatorConfig(doc) || {};
+    const diag = createDiagnostics(callbacks, "[PxAnimator]");
     if (!rootElement) {
       if (doc.id) {
         const rootSelector = getSelector(doc.id);
         rootElement = document.querySelector(rootSelector);
-        if (!rootElement) console.warn("createFrameLoopAnimator: No root element found for selector: ", rootSelector);
+        if (!rootElement) diag.warn(PxDiagnosticKind.host, "createFrameLoopAnimator: No root element found for selector: " + rootSelector);
       } else {
-        console.warn("createFrameLoopAnimator: No root element provided");
+        diag.warn(PxDiagnosticKind.host, "createFrameLoopAnimator: No root element provided");
       }
     }
     const basicApi = createBasicFrameLoopAnimator(
       doc,
-      adapter || createDomAdapter(rootElement),
+      adapter || createDomAdapter(rootElement, diag),
       callbacks
     );
     const api = __spreadProps(__spreadValues({}, basicApi), {
       "getRootElement": () => rootElement || null
     });
-    if (config.trigger) {
-      if (isScrollTimeline(config)) {
-        console.warn("scroll timeline: `animator.trigger` is ignored (triggers do not apply to scroll-driven playback)");
-      } else {
-        setupAnimationTriggers(api, config.trigger);
-      }
+    if (isScrollTimeline(config)) {
+      if (config.trigger) diag.warn(PxDiagnosticKind.usage, "scroll timeline: `animator.trigger` is ignored (triggers do not apply to scroll-driven playback)");
+    } else {
+      const detachTriggers = setupAnimationTriggers(api, (_a2 = config.trigger) != null ? _a2 : {}, diag);
+      const destroyEngine = api.destroy.bind(api);
+      api.destroy = () => {
+        detachTriggers();
+        destroyEngine();
+      };
     }
     return api;
   }
-  function createDomAdapter(rootElement) {
+  function createDomAdapter(rootElement, diag) {
     const warnedSelectors = /* @__PURE__ */ new Set();
+    const report = diag != null ? diag : createDiagnostics(void 0, "[PxAnimator]");
     const adapter = {
       isConnected: () => {
         if (!rootElement) return true;
@@ -6032,7 +6562,7 @@ var PixodeskAnimator = (() => {
         const elements = (rootElement == null ? void 0 : rootElement.querySelectorAll(selector)) || document.querySelectorAll(selector);
         if (elements.length === 0 && !warnedSelectors.has(selector)) {
           warnedSelectors.add(selector);
-          console.warn('setAttribute: No elements found for selector "' + selector + '"');
+          report.warn(PxDiagnosticKind.host, 'setAttribute: No elements found for selector "' + selector + '"');
         }
         for (let i = 0; i < elements.length; i++) {
           const element = elements[i];
@@ -6047,18 +6577,17 @@ var PixodeskAnimator = (() => {
     return adapter;
   }
 
-  // src/PxAnimatorWebApi.ts
+  // src/engines/PxAnimatorWebApi.ts
   function createCssKf(kf, t, propName, unsupportedSet) {
-    var _a, _b;
-    let value = (_a = kf.v) != null ? _a : kf.value;
-    const e = (_b = kf.e) != null ? _b : kf.easing;
+    let value = kfValue(kf);
+    const e = kfEasing(kf);
     const cssKf = {
       offset: t,
       easing: e && Array.isArray(e) ? "cubic-bezier(" + e.join(",") + ")" : void 0
     };
     let cssValue;
     let cssKey = propName;
-    if (COLOUR_ATTR_NAMES.has(propName) && Array.isArray(value)) {
+    if (COLOR_ATTR_NAMES.has(propName) && Array.isArray(value)) {
       cssValue = toRGBA(value);
     } else if (propName === "transform" && value !== null && typeof value === "object" && !Array.isArray(value)) {
       cssValue = composeTransformParts(value, { withUnits: true });
@@ -6085,11 +6614,11 @@ var PixodeskAnimator = (() => {
     return cssKf;
   }
   function clipKeyframesToDuration(propName, keyframes, duration) {
-    var _a, _b, _c, _d, _e;
+    var _a2, _b, _c, _d, _e;
     const result = [];
     for (let i = 0; i < keyframes.length; i++) {
       const kf = keyframes[i];
-      const t = (_a = kf.t) != null ? _a : 0;
+      const t = (_a2 = kf.t) != null ? _a2 : 0;
       if (t < 0) {
         const next = keyframes[i + 1];
         if (next && ((_b = next.t) != null ? _b : 0) >= 0) {
@@ -6118,7 +6647,7 @@ var PixodeskAnimator = (() => {
     return result;
   }
   function convertToWebApiKeyframes(animDef, unsupportedSet, config) {
-    var _a;
+    var _a2;
     const result = /* @__PURE__ */ new Map();
     for (const [propName, propAnim] of Object.entries(animDef)) {
       const duration = config.duration || 1;
@@ -6126,7 +6655,7 @@ var PixodeskAnimator = (() => {
       const cssKeyframes = [];
       for (let i = 0; i < clippedKeyframes.length; i++) {
         const kf = clippedKeyframes[i];
-        const t = clamp(((_a = kf.t) != null ? _a : 0) / duration, 0, 1);
+        const t = clamp(((_a2 = kf.t) != null ? _a2 : 0) / duration, 0, 1);
         const cssKf = createCssKf(kf, t, propName, unsupportedSet);
         if (i === 0 && (cssKf.offset || 0) > 0) {
           cssKeyframes.push(__spreadProps(__spreadValues({}, cssKf), { offset: 0 }));
@@ -6145,18 +6674,19 @@ var PixodeskAnimator = (() => {
     return result;
   }
   function createWebApiAnimator(doc, callbacks, rootElement, forceEvenIfHasUnsupportedAttrs, scrollTimeline) {
-    var _a;
+    var _a2, _b;
     const config = getAnimatorConfig(doc) || {};
+    const diag = createDiagnostics(callbacks, "[PxAnimator]");
     if (!rootElement) {
       if (doc.id) {
         const rootSelector = getSelector(doc.id);
         rootElement = document.querySelector(rootSelector);
-        if (!rootElement) console.warn("createFrameLoopAnimator: No root element found for selector: ", rootSelector);
+        if (!rootElement) diag.warn(PxDiagnosticKind.host, "createWebApiAnimator: No root element found for selector: " + rootSelector);
       } else {
-        console.warn("createFrameLoopAnimator: No root element provided");
+        diag.warn(PxDiagnosticKind.host, "createWebApiAnimator: No root element provided");
       }
     }
-    const bindings = getNormalisedBindings(doc, PxAnimatorEngine.waapi);
+    const bindings = getNormalizedBindings(doc, PxTimelineEngine.native);
     const animations = [];
     const _iterations = config.iterations;
     let iterations;
@@ -6166,18 +6696,18 @@ var PixodeskAnimator = (() => {
     let finishNotified = false;
     let removeCalled = false;
     if (!(bindings == null ? void 0 : bindings.length)) {
-      console.warn("createWebApiAnimator: No animation bindings defined");
+      diag.warn(PxDiagnosticKind.document, "createWebApiAnimator: No animation bindings defined");
     }
     for (const binding of bindings || []) {
       const animDef = binding.animate;
       if (!animDef || typeof animDef !== "object" || Array.isArray(animDef)) {
-        console.warn("createWebApiAnimator: Empty or unresolved binding", binding);
+        diag.warn(PxDiagnosticKind.document, "createWebApiAnimator: Empty or unresolved binding", binding);
         continue;
       }
       const selector = getSelector(binding.id);
       const elements = (rootElement == null ? void 0 : rootElement.querySelectorAll(selector)) || document.querySelectorAll(selector);
       if (elements.length === 0) {
-        console.warn('createWebApiAnimator: No elements found for selector "' + selector + '"');
+        diag.warn(PxDiagnosticKind.host, 'createWebApiAnimator: No elements found for selector "' + selector + '"');
       }
       const keyframesMap = convertToWebApiKeyframes(animDef, unsupportedSet, config);
       const positiveDelay = config.delay && config.delay > 0 ? config.delay : void 0;
@@ -6193,7 +6723,7 @@ var PixodeskAnimator = (() => {
         // animation ends — consistent with Lottie and other animation runtimes.
         // Without this, seeking to the last frame reverts elements to their
         // pre-animation state (the Web Animations API "after" phase with fill:'none').
-        fill: (_a = config.fill) != null ? _a : "forwards",
+        fill: (_a2 = config.fill) != null ? _a2 : "forwards",
         direction: config.direction,
         iterations
       };
@@ -6210,61 +6740,61 @@ var PixodeskAnimator = (() => {
                 if (scrollTimeline.rangeEnd) a.rangeEnd = scrollTimeline.rangeEnd;
               }
               if (callbacks == null ? void 0 : callbacks.onFinish) anim.onfinish = () => {
-                var _a2;
+                var _a3;
                 if (finishNotified) return;
                 finishNotified = true;
-                (_a2 = callbacks.onFinish) == null ? void 0 : _a2.call(callbacks);
+                (_a3 = callbacks.onFinish) == null ? void 0 : _a3.call(callbacks);
               };
               if (callbacks == null ? void 0 : callbacks.onRemove) anim.onremove = () => {
-                var _a2;
+                var _a3;
                 if (removeCalled) return;
                 removeCalled = true;
-                (_a2 = callbacks.onRemove) == null ? void 0 : _a2.call(callbacks);
+                (_a3 = callbacks.onRemove) == null ? void 0 : _a3.call(callbacks);
               };
               if (seekPosition !== void 0) {
                 anim.currentTime = seekPosition;
               }
               animations.push(anim);
             } catch (e) {
-              console.warn(e);
+              diag.warn(PxDiagnosticKind.internal, "createWebApiAnimator: could not build the animation", e);
             }
           }
         }
       }
     }
     if (!forceEvenIfHasUnsupportedAttrs && unsupportedSet.size) {
-      console.warn("Unsupported CSS attrs: " + [...unsupportedSet].join(", "));
+      diag.warn(PxDiagnosticKind.platform, "Unsupported CSS attrs: " + [...unsupportedSet].join(", "));
       return null;
     }
     const api = {
       "isReady": () => true,
       "getRootElement": () => rootElement || null,
       "isPlaying": () => {
-        var _a2;
-        return ((_a2 = animations[0]) == null ? void 0 : _a2.playState) === "running";
+        var _a3;
+        return ((_a3 = animations[0]) == null ? void 0 : _a3.playState) === "running";
       },
       "play": () => {
-        var _a2;
+        var _a3;
         finishNotified = false;
         animations.forEach((a) => a.play());
-        (_a2 = callbacks == null ? void 0 : callbacks.onPlay) == null ? void 0 : _a2.call(callbacks);
+        (_a3 = callbacks == null ? void 0 : callbacks.onPlay) == null ? void 0 : _a3.call(callbacks);
       },
       "pause": () => {
-        var _a2;
+        var _a3;
         animations.forEach((a) => a.pause());
-        (_a2 = callbacks == null ? void 0 : callbacks.onPause) == null ? void 0 : _a2.call(callbacks);
+        (_a3 = callbacks == null ? void 0 : callbacks.onPause) == null ? void 0 : _a3.call(callbacks);
       },
       "cancel": () => {
-        var _a2;
+        var _a3;
         finishNotified = false;
         animations.forEach((a) => a.cancel());
-        (_a2 = callbacks == null ? void 0 : callbacks.onCancel) == null ? void 0 : _a2.call(callbacks);
+        (_a3 = callbacks == null ? void 0 : callbacks.onCancel) == null ? void 0 : _a3.call(callbacks);
       },
       "finish": () => {
-        var _a2;
+        var _a3;
         for (const a of animations) {
           try {
-            if (((_a2 = a.effect) == null ? void 0 : _a2.getTiming().iterations) === Infinity) {
+            if (((_a3 = a.effect) == null ? void 0 : _a3.getTiming().iterations) === Infinity) {
               a.effect.updateTiming({ iterations: 1 });
               a.finish();
               a.effect.updateTiming({ iterations: Infinity });
@@ -6277,36 +6807,55 @@ var PixodeskAnimator = (() => {
         }
       },
       "setPlaybackRate": (rate) => {
+        if (!isValidPlaybackRate(rate)) {
+          diag.warn(PxDiagnosticKind.usage, PX_RATE_REJECTED);
+          return api;
+        }
         animations.forEach((a) => a.playbackRate = rate);
         return api;
       },
       "getCurrentTime": () => {
-        var _a2, _b;
-        const res = (_b = (_a2 = animations[0]) == null ? void 0 : _a2.currentTime) != null ? _b : null;
+        var _a3, _b2;
+        const res = (_b2 = (_a3 = animations[0]) == null ? void 0 : _a3.currentTime) != null ? _b2 : null;
         return res !== null ? +res : null;
       },
       "setCurrentTime": (time) => {
+        var _a3;
+        const ceiling = seekCeilingMs((_a3 = config.duration) != null ? _a3 : 0, iterations != null ? iterations : 1);
+        const seek = ceiling > 0 ? clampSeekMs(time, ceiling) : Math.max(0, time);
         finishNotified = false;
         animations.forEach((a) => {
-          a.currentTime = time;
+          a.currentTime = seek;
         });
       },
+      "getCurrentProgress": () => {
+        var _a3;
+        const t = api.getCurrentTime();
+        return t === null ? null : timeToProgress(t, (_a3 = config.duration) != null ? _a3 : 0, iterations != null ? iterations : 1);
+      },
+      "setCurrentProgress": (progress) => {
+        var _a3;
+        api.setCurrentTime(progressToTimeMs(progress, (_a3 = config.duration) != null ? _a3 : 0, iterations != null ? iterations : 1));
+      },
       "destroy": () => {
-        var _a2;
+        var _a3;
         api.cancel();
         animations.splice(0, animations.length);
         if (!removeCalled) {
           removeCalled = true;
-          (_a2 = callbacks == null ? void 0 : callbacks.onRemove) == null ? void 0 : _a2.call(callbacks);
+          (_a3 = callbacks == null ? void 0 : callbacks.onRemove) == null ? void 0 : _a3.call(callbacks);
         }
       }
     };
-    if (config.trigger) {
-      if (config.timelineSource === "scroll") {
-        console.warn("scroll timeline: `animator.trigger` is ignored (triggers do not apply to scroll-driven playback)");
-      } else {
-        setupAnimationTriggers(api, config.trigger);
-      }
+    if (config.timelineSource === "scroll") {
+      if (config.trigger) diag.warn(PxDiagnosticKind.usage, "scroll timeline: `animator.trigger` is ignored (triggers do not apply to scroll-driven playback)");
+    } else {
+      const detachTriggers = setupAnimationTriggers(api, (_b = config.trigger) != null ? _b : {}, diag);
+      const destroyEngine = api.destroy.bind(api);
+      api.destroy = () => {
+        detachTriggers();
+        destroyEngine();
+      };
     }
     if (scrollTimeline) {
       animations.forEach((a) => a.play());
@@ -6314,21 +6863,22 @@ var PixodeskAnimator = (() => {
     return api;
   }
 
-  // src/PxScrollDriver.ts
+  // src/scroll/PxScrollDriver.ts
   function nativeRangeOffset(point, defaultFraction, view) {
-    var _a, _b, _c;
+    var _a2, _b, _c;
     const fraction = typeof (point == null ? void 0 : point.fraction) === "number" ? point.fraction : defaultFraction;
-    const pct = (_b = (_a = globalThis.CSS) == null ? void 0 : _a.percent) == null ? void 0 : _b.call(_a, fraction * 100);
+    const pct = (_b = (_a2 = globalThis.CSS) == null ? void 0 : _a2.percent) == null ? void 0 : _b.call(_a2, fraction * 100);
     if (pct === void 0) return void 0;
     return view ? { rangeName: (_c = point == null ? void 0 : point.phase) != null ? _c : "cover", offset: pct } : { offset: pct };
   }
-  function createNativeScrollTimeline(subject, config) {
-    var _a, _b, _c, _d;
+  function createNativeScrollTimeline(subject, config, diag) {
+    var _a2, _b, _c, _d;
+    const report = diag != null ? diag : createDiagnostics(void 0, "[PxAnimator]");
     if (!config || !isScrollTimeline(config)) return null;
     const scroll = config.scroll || {};
-    const kind = (_a = scroll.kind) != null ? _a : "view";
+    const kind = (_a2 = scroll.kind) != null ? _a2 : "view";
     if (scroll.smoothing) {
-      console.warn('scroll timeline: `smoothing` needs the built-in driver \u2014 ignoring `driver: "native"`');
+      report.warn(PxDiagnosticKind.platform, "scroll timeline: `smoothing` needs the built-in driver \u2014 using the built-in driver instead of the browser timeline");
       return null;
     }
     const g = globalThis;
@@ -6339,13 +6889,13 @@ var PixodeskAnimator = (() => {
     let timeline;
     try {
       if (view) {
-        timeline = new Ctor({ subject: resolveScrollSubject(subject, scroll.subject), axis });
+        timeline = new Ctor({ subject: resolveScrollSubject(subject, scroll.subject, report), axis });
       } else {
         const source = scroll.source === "root" ? documentScroller() : findNearestScroller(subject, "y") || findNearestScroller(subject, "x") || documentScroller();
         timeline = new Ctor({ source, axis });
       }
     } catch (e) {
-      console.warn("scroll timeline: native timeline construction failed \u2014 falling back to the custom driver", e);
+      report.warn(PxDiagnosticKind.platform, "scroll timeline: native timeline construction failed \u2014 falling back to the player measuring progress itself", e);
       return null;
     }
     return {
@@ -6372,8 +6922,9 @@ var PixodeskAnimator = (() => {
   }
   var SUBJECT_PARENT = "parent";
   var SUBJECT_SCROLLER = "scroller";
-  function resolveScrollSubject(svgRoot, subject) {
-    var _a, _b;
+  function resolveScrollSubject(svgRoot, subject, diag) {
+    var _a2, _b;
+    const report = diag != null ? diag : createDiagnostics(void 0, "[PxAnimator]");
     const spec = subject == null ? void 0 : subject.trim();
     if (!spec) return svgRoot;
     if (spec === SUBJECT_PARENT) {
@@ -6382,7 +6933,7 @@ var PixodeskAnimator = (() => {
         const position = getComputedStyle(p).position;
         if (position === "sticky" || position === "fixed") outermostPinned = p;
       }
-      return (_b = (_a = outermostPinned == null ? void 0 : outermostPinned.parentElement) != null ? _a : svgRoot.parentElement) != null ? _b : svgRoot;
+      return (_b = (_a2 = outermostPinned == null ? void 0 : outermostPinned.parentElement) != null ? _a2 : svgRoot.parentElement) != null ? _b : svgRoot;
     }
     if (spec === SUBJECT_SCROLLER) {
       return findNearestScroller(svgRoot, "y") || findNearestScroller(svgRoot, "x") || documentScroller();
@@ -6391,21 +6942,22 @@ var PixodeskAnimator = (() => {
     try {
       found = document.querySelector(spec);
     } catch (e) {
-      console.warn('scroll timeline: subject "' + spec + '" is not a valid selector \u2014 measuring the SVG itself');
+      report.warn(PxDiagnosticKind.document, 'scroll timeline: subject "' + spec + '" is not a valid selector \u2014 measuring the SVG itself');
       return svgRoot;
     }
     if (!found) {
-      console.warn('scroll timeline: subject "' + spec + '" matched no element \u2014 measuring the SVG itself');
+      report.warn(PxDiagnosticKind.host, 'scroll timeline: subject "' + spec + '" matched no element \u2014 measuring the SVG itself');
       return svgRoot;
     }
     return found;
   }
-  function createScrollDriver(subject, config, onProgress) {
-    var _a, _b;
+  function createScrollDriver(subject, config, onProgress, diag) {
+    var _a2, _b;
     if (!config || !isScrollTimeline(config)) return null;
+    const report = diag != null ? diag : createDiagnostics(void 0, "[PxAnimator]");
     const scroll = config.scroll || {};
-    const kind = (_a = scroll.kind) != null ? _a : "view";
-    const measured = resolveScrollSubject(subject, scroll.subject);
+    const kind = (_a2 = scroll.kind) != null ? _a2 : "view";
+    const measured = resolveScrollSubject(subject, scroll.subject, report);
     const nearest = findNearestScroller(subject, "y") || findNearestScroller(subject, "x");
     const scroller = kind === "scroll" && scroll.source === "root" ? documentScroller() : nearest || documentScroller();
     const isRootScroller = scroller === documentScroller();
@@ -6523,8 +7075,8 @@ var PixodeskAnimator = (() => {
     style.position = "sticky";
     const alignFactor = scroll.pinAlign === "center" ? 0.5 : scroll.pinAlign === "bottom" ? 1 : 0;
     const applyTop = () => {
-      var _a;
-      const extra = (_a = scroll.pinTop) != null ? _a : 0;
+      var _a2;
+      const extra = (_a2 = scroll.pinOffset) != null ? _a2 : 0;
       if (!alignFactor) {
         style.top = extra + "px";
         return;
@@ -6564,42 +7116,43 @@ var PixodeskAnimator = (() => {
     };
   }
 
-  // src/PxAnimatorBind.ts
+  // src/engines/PxAnimatorBind.ts
   function finaliseAnimator(animatorConfig, callbacks, make) {
     let apiRef;
     let effectiveCallbacks = callbacks;
     if (animatorConfig.resetOnFinish) {
       effectiveCallbacks = __spreadProps(__spreadValues({}, callbacks), {
         onFinish: () => {
-          var _a;
-          (_a = callbacks == null ? void 0 : callbacks.onFinish) == null ? void 0 : _a.call(callbacks);
+          var _a2;
+          (_a2 = callbacks == null ? void 0 : callbacks.onFinish) == null ? void 0 : _a2.call(callbacks);
           apiRef == null ? void 0 : apiRef.cancel();
         }
       });
     }
     const res = make(effectiveCallbacks);
     apiRef = res;
-    if (animatorConfig.debugInstName) {
-      window[animatorConfig.debugInstName] = res;
+    if (animatorConfig.debugGlobalName) {
+      window[animatorConfig.debugGlobalName] = res;
     }
     return res;
   }
   function bindWithEngineChoice(doc, adapter, callbacks, rootElement) {
     const animatorConfig = getAnimatorConfig(doc) || {};
+    const diag = createDiagnostics(callbacks, "[PxAnimator]");
     if (isScrollTimeline(animatorConfig)) {
       return finaliseAnimator(animatorConfig, callbacks, (cb) => {
-        var _a, _b;
+        var _a2;
         let unpin = () => {
         };
-        if (animatorConfig.mode !== PxAnimatorMode.frames && ((_a = animatorConfig.scroll) == null ? void 0 : _a.driver) === "native" && rootElement) {
+        if (mayUseNativeScrollTimeline(animatorConfig.engine) && rootElement) {
           unpin = applyScrollPin(rootElement, animatorConfig.scroll);
-          const native = createNativeScrollTimeline(rootElement, animatorConfig);
+          const native = createNativeScrollTimeline(rootElement, animatorConfig, diag);
           if (native) {
             const api2 = createWebApiAnimator(
               doc,
               cb,
               rootElement,
-              animatorConfig.mode === PxAnimatorMode.waapi,
+              isNativeForced(animatorConfig.engine),
               native
             );
             if (api2) {
@@ -6615,15 +7168,16 @@ var PixodeskAnimator = (() => {
           unpin = () => {
           };
         }
-        const api = (animatorConfig.mode !== PxAnimatorMode.frames ? createWebApiAnimator(doc, cb, rootElement, animatorConfig.mode === PxAnimatorMode.waapi) : null) || createFrameLoopAnimator(doc, adapter, cb, rootElement);
-        const subject = ((_b = api.getRootElement) == null ? void 0 : _b.call(api)) || rootElement;
+        const api = (animatorConfig.engine !== PxTimelineEngineExtra.js ? createWebApiAnimator(doc, cb, rootElement, isNativeForced(animatorConfig.engine)) : null) || createFrameLoopAnimator(doc, adapter, cb, rootElement);
+        const subject = ((_a2 = api.getRootElement) == null ? void 0 : _a2.call(api)) || rootElement;
         if (subject) {
           unpin = applyScrollPin(subject, animatorConfig.scroll);
           const totalMs = scrollTotalDurationMs(animatorConfig);
           const driver = createScrollDriver(
             subject,
             animatorConfig,
-            (progress) => api.setCurrentTime(progress * totalMs)
+            (progress) => api.setCurrentTime(progress * totalMs),
+            diag
           );
           if (driver) {
             const destroy = api.destroy.bind(api);
@@ -6634,58 +7188,58 @@ var PixodeskAnimator = (() => {
             };
           }
         } else {
-          console.warn("scroll timeline: no root element to observe \u2014 animation will stay at frame 0");
+          diag.warn(PxDiagnosticKind.host, "scroll timeline: no root element to observe \u2014 animation will stay at frame 0");
         }
         return api;
       });
     }
     return finaliseAnimator(animatorConfig, callbacks, (cb) => {
-      if (animatorConfig.mode === PxAnimatorMode.frames) {
+      if (animatorConfig.engine === PxTimelineEngineExtra.js) {
         return createFrameLoopAnimator(doc, adapter, cb, rootElement);
       }
       return createWebApiAnimator(
         doc,
         cb,
         rootElement,
-        animatorConfig.mode === PxAnimatorMode.waapi
-        // forcing waapi
+        isNativeForced(animatorConfig.engine)
       ) || createFrameLoopAnimator(doc, adapter, cb, rootElement);
     });
   }
 
-  // src/PxAnimatorDOM.ts
+  // src/dom/PxAnimatorDOM.ts
   var SVG_NS = "http://www.w3.org/2000/svg";
-  function createElement(tagName, normalisedProps, style, children, textContent) {
+  function createElement(tagName, normalizedProps, style, children, textContent, diag) {
     if (DISALLOWED_SVG_TAGS_LOWER.has(tagName.toLowerCase())) {
-      console.warn("SVG tag blocked (dangerous): ", tagName);
+      (diag != null ? diag : createDiagnostics(void 0, "[PxAnimator]")).warn(PxDiagnosticKind.document, "SVG tag blocked (dangerous): " + tagName);
       return null;
     }
     const element = document.createElementNS(SVG_NS, tagName);
-    for (const propName in normalisedProps) {
-      const sanitised = sanitiseAttributeValue(propName, normalisedProps[propName]);
-      if (sanitised === void 0) continue;
+    for (const propName in normalizedProps) {
+      const sanitized = sanitizeAttributeValue(propName, normalizedProps[propName]);
+      if (sanitized === void 0) continue;
       if (CSS_ONLY_STYLE_PROPS.has(propName)) {
-        element.style[propName] = String(sanitised);
+        element.style[propName] = String(sanitized);
         continue;
       }
-      element.setAttribute(camelCaseToKebabWordIfNeeded(propName), sanitised);
+      element.setAttribute(camelCaseToKebabWordIfNeeded(propName), sanitized);
     }
     if (style) {
       for (const styleProp in style) {
         element.style[styleProp] = String(style[styleProp]);
       }
     }
-    if (children) {
+    if (children == null ? void 0 : children.length) {
       for (const child of children) {
         element.appendChild(child);
       }
+    } else if (textContent) {
+      element.textContent = textContent;
     }
-    if (textContent) element.textContent = textContent;
     return element;
   }
-  function renderNode(node, defs) {
+  function renderNode(node, defs, diag) {
     if (!node) return null;
-    const _a = node, { type, children, style } = _a, props = __objRest(_a, ["type", "children", "style"]);
+    const _a2 = node, { type, children, style } = _a2, props = __objRest(_a2, ["type", "children", "style"]);
     const domType = props.domType;
     if (domType !== void 0) delete props.domType;
     const nodeDefs = getDefs(node) || defs;
@@ -6693,7 +7247,7 @@ var PixodeskAnimator = (() => {
     let childElements;
     if (children) {
       for (const ch of children) {
-        const child = renderNode(ch, nodeDefs);
+        const child = renderNode(ch, nodeDefs, diag);
         if (child) {
           if (!childElements) childElements = [];
           childElements.push(child);
@@ -6705,31 +7259,39 @@ var PixodeskAnimator = (() => {
       getNormalizedProps(props),
       resolvedStyle,
       childElements,
-      props[TEXT_CONTENT_ATTR] || props[TEXT_ATTR]
+      props[TEXT_CONTENT_ATTR],
+      diag
     );
     if (element && domType !== void 0) element.setAttribute("type", domType);
     return element;
   }
 
-  // src/PxAnimatorKeys.ts
-  var PX_ANIMATOR_DATA_KEY = "data";
+  // src/shared/PxAnimatorKeys.ts
+  var PX_ANIMATOR_DOC_KEY = "doc";
 
-  // src/PxAnimator.ts
+  // src/animator/PxAnimator.ts
   function createAnimatorFromConfig(doc, adapter, callbacks, rootElement) {
     return bindWithEngineChoice(doc, adapter, callbacks, rootElement);
   }
-  function createAnimatorImpl(doc, adapter, callbacks, containerElement) {
+  function createAnimatorImpl(doc, adapter, callbacks, containerElement, patch, resetTimeline) {
+    const diag = createDiagnostics(callbacks, "[PxAnimator]");
     const effectsWarnings = validateNodeEffects(doc);
-    for (const w of effectsWarnings) console.warn("[PxAnimator] effects shape warning:", w);
+    for (const w of effectsWarnings) diag.warn(PxDiagnosticKind.document, "effects shape: " + w);
+    reportDocumentDiagnostics(doc, "[PxAnimator] createAnimator");
+    if (patch !== void 0 || resetTimeline) {
+      const patched = applyAnimatorConfig(doc, patch != null ? patch : {}, { resetDefaults: !!resetTimeline });
+      for (const w of patched.warnings) diag.warn(PxDiagnosticKind.usage, "timeline override: " + w);
+      doc = patched.doc;
+    }
     const animatorConfig = getAnimatorConfig(doc) || {};
-    const engine = animatorConfig.mode === PxAnimatorMode.frames ? PxAnimatorEngine.frames : PxAnimatorEngine.waapi;
-    doc = materialiseAllInTree(doc, engine);
+    const engine = resolveTimelineEngine(animatorConfig.engine);
+    doc = materializeAllInTree(doc, engine);
     let rootElement = null;
     if (containerElement) {
       doc = generateNewIds(doc);
       const containerEl = typeof containerElement === "string" ? document.querySelector(containerElement) : containerElement;
       if (containerEl) {
-        rootElement = renderNode(doc);
+        rootElement = renderNode(doc, void 0, diag);
         if (rootElement) {
           containerEl.replaceChildren(rootElement);
         }
@@ -6746,16 +7308,22 @@ var PixodeskAnimator = (() => {
     }
     return api;
   }
+  function resolveTimelineOption(options) {
+    const { timeline, duration, delay, iterations, startOn } = options;
+    return foldTimelineOverride(timeline, { duration, delay, iterations, startOn });
+  }
   function createAnimator(options) {
-    const { src, data, adapter, callbacks, container } = options;
-    if (data !== void 0 && src !== void 0) {
-      throw new Error("createAnimator: provide either `src` or `data`, not both");
+    const { src, doc, adapter, container, resetTimeline } = options;
+    const patch = resolveTimelineOption(options);
+    const callbacks = toEngineCallbacks(options);
+    if (doc !== void 0 && src !== void 0) {
+      throw new Error("createAnimator: provide either `src` or `doc`, not both");
     }
-    if (data === void 0 && src === void 0) {
-      throw new Error("createAnimator: either `src` or `data` is required");
+    if (doc === void 0 && src === void 0) {
+      throw new Error("createAnimator: either `src` or `doc` is required");
     }
-    if (data !== void 0) {
-      return createAnimatorImpl(data, adapter, callbacks, container);
+    if (doc !== void 0) {
+      return createAnimatorImpl(doc, adapter, callbacks, container, patch, resetTimeline);
     }
     let animator = null;
     let pending = [];
@@ -6767,19 +7335,27 @@ var PixodeskAnimator = (() => {
         pending.push(call);
       }
     };
+    const loadDiag = createDiagnostics(callbacks, "[PxAnimator]");
     fetch(src).then((res) => res.json()).then((json) => {
       if (destroyed) return;
       if (isPxElementFileFormat(json)) {
-        animator = createAnimatorImpl(json, adapter, callbacks, container);
+        animator = createAnimatorImpl(json, adapter, callbacks, container, patch, resetTimeline);
         const queued = pending;
         pending = null;
         queued == null ? void 0 : queued.forEach((call) => call(animator));
       } else {
-        console.error('createAnimator: invalid animation document format at "' + src + '"');
+        loadDiag.error(
+          PxDiagnosticKind.document,
+          'createAnimator: invalid animation document format at "' + src + '"'
+        );
       }
     }).catch((err) => {
+      var _a2;
       pending = null;
-      console.error('createAnimator: failed to load "' + src + '"', err);
+      loadDiag.error(
+        PxDiagnosticKind.host,
+        'createAnimator: failed to load "' + src + '" \u2014 ' + ((_a2 = err == null ? void 0 : err.message) != null ? _a2 : String(err))
+      );
     });
     return {
       "isReady": () => !!animator,
@@ -6804,6 +7380,10 @@ var PixodeskAnimator = (() => {
       "setCurrentTime": (time) => {
         enqueue((api) => api.setCurrentTime(time));
       },
+      "getCurrentProgress": () => animator ? animator.getCurrentProgress() : null,
+      "setCurrentProgress": (progress) => {
+        enqueue((api) => api.setCurrentProgress(progress));
+      },
       "destroy": () => {
         destroyed = true;
         pending = null;
@@ -6811,23 +7391,18 @@ var PixodeskAnimator = (() => {
       }
     };
   }
-  function loadTagAnimators() {
+  function loadTagAnimators(options) {
     const elements = document.querySelectorAll("[" + PX_ANIM_SRC_ATTR_NAME + "]");
     for (let i = 0; i < elements.length; i++) {
       const element = elements[i];
       if (!element[PX_ANIM_ATTR_NAME]) {
         const src = element.getAttribute(PX_ANIM_SRC_ATTR_NAME);
         if (src) {
-          element[PX_ANIM_ATTR_NAME] = createAnimator({ src, container: element });
+          element[PX_ANIM_ATTR_NAME] = createAnimator(__spreadProps(__spreadValues({}, options), { src, container: element }));
         }
       }
     }
   }
-  if (typeof window !== "undefined") {
-    window["loadTagAnimators"] = loadTagAnimators;
-    window["createAnimator"] = createAnimator;
-    window["setupAnimationTriggers"] = setupAnimationTriggers;
-  }
   return __toCommonJS(index_player_exports);
 })();
 //# sourceMappingURL=pixodesk-svg-animator.umd.js.map