@pixodesk/svg-animator-web 1.0.30 → 1.0.35

package/dist/index.cjs

@@ -58,12 +58,11 @@ __export(index_exports, {
   PxAnimatedSvgDocumentSchema: () => PxAnimatedSvgDocumentSchema,
   PxAnimationDefinitionSchema: () => PxAnimationDefinitionSchema,
   PxAnimatorConfigSchema: () => PxAnimatorConfigSchema,
-  PxAnimatorEngine: () => PxAnimatorEngine,
-  PxAnimatorMode: () => PxAnimatorMode,
   PxAttrValueSchema: () => PxAttrValueSchema,
   PxBezierPathSchema: () => PxBezierPathSchema,
   PxBindingSchema: () => PxBindingSchema,
   PxCloneEffectSchema: () => PxCloneEffectSchema,
+  PxCloneWithout: () => PxCloneWithout,
   PxDefsSchema: () => PxDefsSchema,
   PxEasingOrRefSchema: () => PxEasingOrRefSchema,
   PxEffectsSchema: () => PxEffectsSchema,
@@ -75,6 +74,8 @@ __export(index_exports, {
   PxGradientUnits: () => PxGradientUnits,
   PxKeyframeSchema: () => PxKeyframeSchema,
   PxKeyframeValueSchema: () => PxKeyframeValueSchema,
+  PxLoopDirection: () => PxLoopDirection,
+  PxLoopRepeatAt: () => PxLoopRepeatAt,
   PxLoopSchema: () => PxLoopSchema,
   PxMaskedByEffectSchema: () => PxMaskedByEffectSchema,
   PxNodeBase: () => PxNodeBase,
@@ -84,15 +85,19 @@ __export(index_exports, {
   PxRetimeEffectSchema: () => PxRetimeEffectSchema,
   PxStrokeGradientEffectSchema: () => PxStrokeGradientEffectSchema,
   PxStrokeTrimEffectSchema: () => PxStrokeTrimEffectSchema,
+  PxStrokeTrimSubPaths: () => PxStrokeTrimSubPaths,
   PxSvgNodeExtra: () => PxSvgNodeExtra,
   PxTextEffectSchema: () => PxTextEffectSchema,
   PxTextPathEffectSchema: () => PxTextPathEffectSchema,
+  PxTimelineEngine: () => PxTimelineEngine,
+  PxTimelineEngineExtra: () => PxTimelineEngineExtra,
   PxTransformByEffectSchema: () => PxTransformByEffectSchema,
   PxTransformPartsSchema: () => PxTransformPartsSchema,
   PxTransformValueSchema: () => PxTransformValueSchema,
   PxTriggerSchema: () => PxTriggerSchema,
   STYLE_ATTR_NAMES: () => STYLE_ATTR_NAMES,
   TRANSFORM_FN_NAMES: () => TRANSFORM_FN_NAMES,
+  applyAnimatorConfig: () => applyAnimatorConfig,
   applyPlayerEffects: () => applyPlayerEffects,
   calcAnimationValues: () => calcAnimationValues,
   camelCaseToKebabWordIfNeeded: () => camelCaseToKebabWordIfNeeded,
@@ -107,6 +112,7 @@ __export(index_exports, {
   diffInEffect: () => diffInEffect,
   evaluateMotionPathSegment: () => evaluateMotionPathSegment,
   extendedPathForBrowser: () => extendedPathForBrowser,
+  foldAnimatorConfigShortcuts: () => foldAnimatorConfigShortcuts,
   generateNewIds: () => generateNewIds,
   getAnimatorConfig: () => getAnimatorConfig,
   getBindings: () => getBindings,
@@ -127,6 +133,7 @@ __export(index_exports, {
   materialiseInternalLoopsInTree: () => materialiseInternalLoopsInTree,
   materialiseMotionPathInPropAnim: () => materialiseMotionPathInPropAnim,
   materialiseMotionPathsInTree: () => materialiseMotionPathsInTree,
+  mergeAnimatorConfig: () => mergeAnimatorConfig,
   normalizeDocument: () => getNormalisedBindings,
   propAnimIsMotionPath: () => propAnimIsMotionPath,
   px: () => px,
@@ -135,6 +142,7 @@ __export(index_exports, {
   setupAnimationTriggers: () => setupAnimationTriggers,
   shiftAnimatable: () => shiftAnimatable,
   toRGBA: () => toRGBA,
+  validateDocument: () => validateDocument,
   validateNodeEffects: () => validateNodeEffects,
   visualModelAt: () => visualModelAt
 });
@@ -174,7 +182,7 @@ var __objRest2 = (source, exclude) => {
   return target;
 };
 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;
@@ -185,7 +193,7 @@ function bezierToSvgPath(path, forceCurves = false) {
   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]);
@@ -236,7 +244,7 @@ function interpolateBeziers(paths1, paths2, progress) {
   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);
@@ -247,7 +255,7 @@ function interpolateBezier(path1, path2, progress) {
     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;
@@ -366,8 +374,8 @@ function toRGBA(color) {
   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]] : []];
@@ -406,9 +414,9 @@ var COLOUR_ATTR_NAMES = /* @__PURE__ */ new Set(["color", "fill", "flood-color",
 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;
@@ -425,6 +433,38 @@ function composeTransformParts(parts, opts) {
   if (o) segs.push("translate(" + -o[0] + tu + "," + -o[1] + tu + ")");
   return segs.join("");
 }
+function parseTransformParts(str2) {
+  var _a2, _b;
+  if (!str2 || typeof str2 !== "string") return void 0;
+  const out = {};
+  const re = /([a-zA-Z]+)\s*\(([^)]*)\)/g;
+  const order = ["translate", "rotate", "skewX", "scale"];
+  let lastIdx = -1;
+  let m;
+  while ((m = re.exec(str2)) !== null) {
+    const fn = m[1];
+    const idx = order.indexOf(fn);
+    if (idx < 0 || idx <= lastIdx) return void 0;
+    lastIdx = idx;
+    const nums = m[2].split(/[\s,]+/).filter(Boolean).map(Number);
+    if (nums.some((n) => Number.isNaN(n))) return void 0;
+    if (fn === "translate") {
+      if (nums.length < 1 || nums.length > 2) return void 0;
+      out.translate = [nums[0], (_a2 = nums[1]) != null ? _a2 : 0];
+    } else if (fn === "rotate") {
+      if (nums.length !== 1) return void 0;
+      out.rotate = nums[0];
+    } else if (fn === "skewX") {
+      if (nums.length !== 1) return void 0;
+      out.skew = nums[0];
+    } else {
+      if (nums.length < 1 || nums.length > 2) return void 0;
+      out.scale = [nums[0], (_b = nums[1]) != null ? _b : nums[0]];
+    }
+  }
+  if (str2.replace(/([a-zA-Z]+)\s*\(([^)]*)\)/g, "").replace(/[\s,]/g, "").length) return void 0;
+  return Object.keys(out).length ? out : void 0;
+}
 var STYLE_ATTR_NAMES = /* @__PURE__ */ new Set(["offset-distance", "offsetDistance"]);
 var DEFAULT_DURATION_MS = 1e3;
 function kebabToCamelCaseWord(kebab) {
@@ -614,8 +654,8 @@ function scrollPhaseInterval(phase, subjectSize, scrollportSize) {
 }
 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);
 }
@@ -627,9 +667,9 @@ function scrollViewProgress(subjectStart, subjectSize, scrollportSize, range) {
   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);
@@ -641,6 +681,7 @@ function scrollResolveAxis(axis, writingMode) {
   if (a === "inline") return vertical ? "y" : "x";
   return vertical ? "x" : "y";
 }
+var PX_UNKNOWN_KEY_ERROR = "unexpected extra key";
 function pathStr(path) {
   if (!path.length) return ".";
   let result = "";
@@ -752,6 +793,7 @@ var Union = class extends Base {
   constructor(schemas, defaultVal) {
     super();
     this.schemas = schemas;
+    this._kind = "union";
     this._default = defaultVal != null ? defaultVal : schemas[0]._default;
   }
   sanitize(raw) {
@@ -761,10 +803,10 @@ var Union = class extends Base {
     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));
+    ctx == null ? void 0 : ctx.errors.push(pathStr(path != null ? path : []) + ": no union member matched for value " + ((_a2 = JSON.stringify(raw)) != null ? _a2 : "").slice(0, 240));
     return false;
   }
   _canSanitize(raw) {
@@ -773,25 +815,30 @@ var Union = class extends Base {
 };
 var DiscriminatedUnion = class extends Base {
   constructor(_key, _schemas, defaultVal) {
+    var _a2;
     super();
     this._key = _key;
     this._schemas = _schemas;
+    this._kind = "discriminatedUnion";
     this._default = defaultVal != null ? defaultVal : _schemas[0]._default;
     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);
@@ -820,7 +867,8 @@ var Obj = class extends Base {
     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;
   }
@@ -842,7 +890,7 @@ var Obj = class extends Base {
         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;
       }
@@ -866,7 +914,8 @@ var OpenObj = class extends Base {
     const src = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
     const out = __spreadValues2({}, 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)) {
@@ -938,6 +987,7 @@ var Rec = class extends Base {
   constructor(value) {
     super();
     this.value = value;
+    this._kind = "record";
     this._default = {};
   }
   sanitize(raw) {
@@ -1006,8 +1056,8 @@ var Lazy = class extends Base {
     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);
@@ -1023,6 +1073,7 @@ var Tuple = class extends Base {
   constructor(schemas) {
     super();
     this.schemas = schemas;
+    this._kind = "tuple";
     this._default = schemas.map((s) => s._default);
   }
   sanitize(raw) {
@@ -1057,12 +1108,22 @@ function schemaKeys(schema) {
   );
 }
 function describeSchema(schema) {
-  var _a;
+  var _a2;
   const s = schema;
-  if ("_shape" in s) return { kind: "shape", shape: s._shape };
+  switch (s._kind) {
+    case "union":
+      return { kind: "union", members: s.schemas };
+    case "discriminatedUnion":
+      return { kind: "discriminatedUnion", key: s._key, members: s._schemas };
+    case "record":
+      return { kind: "record", value: s.value };
+    case "tuple":
+      return { kind: "tuple", items: s.schemas };
+  }
+  if ("_shape" in s) return { kind: "shape", shape: s._shape, openValue: s._openSchema };
   if ("item" in s) return { kind: "array", item: s.item };
   if ("inner" in s) return { kind: "optional", inner: s.inner };
-  if ("fn" in s) return { kind: "lazy", resolved: (_a = s.resolved) != null ? _a : s.fn() };
+  if ("fn" in s) return { kind: "lazy", resolved: (_a2 = s.resolved) != null ? _a2 : s.resolved = s.fn() };
   return { kind: "leaf" };
 }
 var px = {
@@ -1116,24 +1177,49 @@ var px = {
   /** Defers schema creation — required for recursive types. Must supply a default value. */
   lazy: (fn, defaultVal) => new Lazy(fn, defaultVal)
 };
+var PX_PLAYER_SCHEMA_VERSION = "1.1";
+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 };
 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 PX_TIMELINE_SHARED_KEYS = ["duration", "iterations", "engine", "frameRate"];
+var PX_TIME_ONLY_TIMELINE_KEYS = ["trigger", "delay", "fillMode", "direction"];
+var PxTimelineEngine = {
+  native: "native",
+  js: "js"
 };
-var PxAnimatorEngine = {
-  waapi: PxAnimatorMode.waapi,
-  frames: PxAnimatorMode.frames
+var PxTimelineEngineExtra = __spreadProps2(__spreadValues2({}, 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 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 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 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",
@@ -1143,8 +1229,9 @@ var PxUnits = {
   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",
@@ -1168,6 +1255,9 @@ var PxStrokeTrimSubPaths = {
 };
 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",
@@ -1178,7 +1268,18 @@ var INTERNAL_ATTRS = /* @__PURE__ */ new Set([
   TEXT_ATTR,
   TEXT_CONTENT_ATTR
 ]);
-var PX_TRANSFORM_PART_KEYS = ["translate", "rotate", "scale", "origin"];
+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 PxGradientUnits = {
   userSpaceOnUse: "userSpaceOnUse",
   objectBoundingBox: "objectBoundingBox"
@@ -1196,23 +1297,68 @@ function isPxElementFileFormat(fileJson) {
   if (!(fileJson && typeof fileJson === "object" && !Array.isArray(fileJson))) {
     return false;
   }
-  return fileJson["type"] === "svg";
+  return fileJson.type === "svg";
 }
 function getAnimatorConfig(doc) {
-  var _a;
-  return (doc == null ? void 0 : doc.animator) || ((_a = doc == null ? void 0 : doc.meta) == null ? void 0 : _a.animator);
+  var _a2;
+  const cfg = (doc == null ? void 0 : doc.animator) || ((_a2 = doc == null ? void 0 : doc.meta) == null ? void 0 : _a2.animator);
+  return cfg ? flattenAnimatorTimeline(cfg) : void 0;
+}
+var flattenMemo = /* @__PURE__ */ new WeakMap();
+function flattenAnimatorTimeline(cfg) {
+  const timeline = cfg.timeline;
+  if (timeline === void 0 || timeline === null || typeof timeline !== "object") return cfg;
+  const memoised = flattenMemo.get(cfg);
+  if (memoised) return memoised;
+  const _a2 = cfg, { timeline: _dropped } = _a2, flat = __objRest2(_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 = __spreadValues2({}, flat.scroll || {});
+    scroll.kind = timeline.type;
+    if (timeline.axis !== void 0) scroll.axis = timeline.axis;
+    if (timeline.source !== void 0) scroll.source = timeline.source;
+    if (timeline.subject !== void 0) scroll.subject = timeline.subject;
+    if (timeline.smoothing !== void 0) scroll.smoothing = timeline.smoothing;
+    if (timeline.range !== void 0) scroll.range = timeline.range;
+    const pin = timeline.pin;
+    if (typeof pin === "boolean") scroll.pin = pin;
+    else if (pin && typeof pin === "object") {
+      scroll.pin = true;
+      if (pin.align !== void 0) scroll.pinAlign = pin.align;
+      if (pin.top !== void 0) scroll.pinTop = pin.top;
+      if (pin.distance !== void 0) scroll.pinDistance = pin.distance;
+    }
+    flat.scroll = scroll;
+  } else {
+    if (timeline.duration !== void 0) flat.duration = timeline.duration;
+    if (timeline.trigger !== void 0) {
+      const _b = timeline.trigger, { finishAction } = _b, restTrigger = __objRest2(_b, ["finishAction"]);
+      if (Object.keys(restTrigger).length) flat.trigger = restTrigger;
+      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.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, animate: anim }));
+  return Object.entries(animateById).map(([id, anim]) => ({ id: id.startsWith("#") ? id.slice(1) : id, animate: anim }));
 }
 function getChildren(doc) {
   return doc == null ? void 0 : doc.children;
@@ -1226,39 +1372,54 @@ var PxKeyframeValueSchema = implementsInterface()(px.union([
   // e.g. for colors
   px.number(),
   px.array(px.number()),
-  px.lazy(() => PxTransformPartsSchema, {}),
+  // ORDER LAW: the key-discriminated object shapes (`{path}`, `{paths}`) come BEFORE the
+  // all-optional transform-parts record. In default (non-strict) mode that record accepts
+  // ANY object (every key optional, unknown keys ignored), so listing it earlier made
+  // Union.sanitize route `{path}`/`{paths}` values into it and strip them to `{}` —
+  // silent morph-data loss (repro: the editor's keyframeValueSanitize spec). Validity is
+  // order-independent (`some()`); only sanitize routing depends on this order.
   px.object({ path: px.string() }),
   px.lazy(() => px.object({ paths: px.array(PxBezierPathSchema) }), { paths: [] }),
   // Gradient `stops` timeline — each kf value is the full stops-array snapshot.
-  px.lazy(() => px.array(PxGradientStopSchema), [])
+  px.lazy(() => px.array(PxGradientStopSchema), []),
+  px.lazy(() => PxTransformPartsSchema, {})
 ]));
 var PxKeyframeSchema = implementsInterface()(px.object({
   time: px.number().optional(),
-  t: px.number().optional(),
   value: PxKeyframeValueSchema.optional(),
-  v: PxKeyframeValueSchema.optional(),
   easing: PxEasingOrRefSchema.optional(),
-  e: PxEasingOrRefSchema.optional(),
   tangentOut: px.tuple([px.number(), px.number()]).optional(),
-  to: px.tuple([px.number(), px.number()]).optional(),
-  // short alias
-  tangentIn: px.tuple([px.number(), px.number()]).optional(),
-  ti: px.tuple([px.number(), px.number()]).optional(),
-  // short alias
-  selected: px.boolean().optional()
-  // editor-side UI state (Player ignores it)
+  tangentIn: px.tuple([px.number(), px.number()]).optional()
+  // (`selected` — editor timeline-selection UI state — was REMOVED from the wire
+  // (review §1.3): editor data lives under `meta`. The editor still carries it on
+  // its internal COPY-PASTE payload, which never validates against this schema.)
 }));
+var 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(),
-  kfs: px.array(PxKeyframeSchema).optional(),
   loop: px.union([PxLoopSchema, px.boolean()]).optional(),
-  autoOrient: px.boolean().optional()
+  autoOrient: px.boolean().optional(),
+  alongPathMode: px.enum(["sampled", "offsetPath"]).optional()
 }));
 var PxTransformPartsSchema = implementsInterface()(px.object({
   translate: px.tuple([px.number(), px.number()]).optional(),
@@ -1284,6 +1445,10 @@ var PxElementAnimationSchema = implementsInterface()(px.union([
 var PxTriggerSchema = implementsInterface()(px.object({
   startOn: px.enum(["load", "mouseOver", "click", "scrollIntoView", "programmatic"]).optional(),
   outAction: px.enum(["continue", "pause", "reset", "reverse"]).optional(),
+  // What happens after a NATURAL finish — `'hold'` (default: keep the end state per
+  // `fill`) or `'reset'` (snap back to the start state). Pairs with `outAction` ("what
+  // happens when the trigger condition ends"); both end-of-life knobs now read alike.
+  finishAction: px.enum(["hold", "reset"]).optional(),
   scrollIntoViewThreshold: px.number().optional()
 }));
 var PxGlyphSchema = implementsInterface()(px.object({
@@ -1291,8 +1456,8 @@ var PxGlyphSchema = implementsInterface()(px.object({
   d: px.string()
 }));
 var PxGlyphFontSchema = implementsInterface()(px.object({
-  fFamily: px.string(),
-  style: px.string(),
+  fontFamily: px.string(),
+  fontStyle: px.string(),
   ascent: px.number(),
   unitsPerEm: px.number(),
   glyphs: px.record(PxGlyphSchema)
@@ -1300,8 +1465,10 @@ var PxGlyphFontSchema = implementsInterface()(px.object({
 var PxDefsSchema = implementsInterface()(px.object({
   easings: px.record(px.tuple([px.number(), px.number(), px.number(), px.number()])).optional(),
   animations: px.record(PxAnimationDefinitionSchema).optional(),
-  styles: px.record(px.any()).optional(),
-  glyphs: px.record(PxGlyphFontSchema).optional()
+  // Review §2.6: the schema now matches the declared type — a style preset is a flat
+  // record of string|number attribute values, nothing nested.
+  styles: px.record(px.record(px.union([px.string(), px.number()]))).optional(),
+  fonts: px.record(PxGlyphFontSchema).optional()
 }));
 var PX_SCROLL_PHASES = ["cover", "contain", "entry", "exit", "entry-crossing", "exit-crossing"];
 var PxScrollRangePointSchema = implementsInterface()(px.object({
@@ -1313,7 +1480,6 @@ var PxScrollRangeSchema = px.object({
   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(),
@@ -1326,23 +1492,67 @@ var PxScrollSchema = implementsInterface()(px.object({
   pinDistance: px.number().optional(),
   range: PxScrollRangeSchema.optional()
 }));
-var PxAnimatorConfigSchema = implementsInterface()(px.object({
-  mode: px.enum([PxAnimatorMode.auto, PxAnimatorMode.waapi, PxAnimatorMode.frames]).optional(),
+var PxTimelinePinSchema = implementsInterface()(px.object({
+  align: px.enum(["top", "center", "bottom"]).optional(),
+  top: px.number().optional(),
+  distance: px.number().optional()
+}));
+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(),
-  // LAW (SCHEMA-DESIGN R3, S10): the ONE sanctioned string-in-number union
-  // (CSS animation-iteration-count familiarity) — do not add more mixed unions.
   iterations: px.union([px.number(), px.literal("infinite")]).optional(),
-  fill: px.enum(["forwards", "backwards", "both", "none"]).optional(),
-  direction: px.enum(["normal", "reverse", "alternate", "alternate-reverse"]).optional(),
+  // `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(["forwards", "backwards", "both", "none"]).optional(),
+  direction: px.enum(["normal", "reverse", "alternate", "alternate-reverse"]).optional()
+}));
+var scrollishTimelineShape = {
+  // §2.8: duration is a property of the TIMELINE — under scrubbing it is the keyframe
+  // span the scroll range maps onto.
+  duration: px.number().optional(),
+  // Finite repeat count IS meaningful when scrubbing — the scroll range maps onto
+  // duration × iterations (rule D4; `'infinite'` cannot map to a range, so no literal here).
+  iterations: px.number().optional(),
+  engine: PxTimelineEngineSchema,
   frameRate: px.number().optional(),
-  trigger: PxTriggerSchema.optional(),
-  resetOnFinish: px.boolean().optional(),
+  axis: px.enum(["block", "inline", "x", "y"]).optional(),
+  source: px.enum(["nearest", "root"]).optional(),
+  subject: px.string().optional(),
+  // 'parent' | 'scroller' | any CSS selector
+  smoothing: px.number().optional(),
+  // ms
+  pin: px.union([px.boolean(), PxTimelinePinSchema]).optional(),
+  range: PxScrollRangeSchema.optional()
+};
+var PxScrollTimelineSchema = implementsInterface()(
+  px.object(__spreadValues2({ type: px.literal("scroll") }, scrollishTimelineShape))
+);
+var PxViewTimelineSchema = implementsInterface()(
+  px.object(__spreadValues2({ type: px.literal("view") }, scrollishTimelineShape))
+);
+var PxTimelineSchema = px.discriminatedUnion("type", [
+  PxTimeTimelineSchema,
+  // first = the member an absent `type` selects
+  PxScrollTimelineSchema,
+  PxViewTimelineSchema
+]);
+var PxAnimatorConfigSchema = implementsInterface()(px.object({
+  // (`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(),
-  timelineSource: px.string().optional(),
-  scroll: PxScrollSchema.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(),
@@ -1360,18 +1570,18 @@ var PxAttrValueSchema = px.union([
 ]);
 var PxAnimatableNumberSchema = px.union([
   px.number(),
-  px.object({ value: px.number() }),
-  PxPropertyAnimationSchema
+  PxPropertyAnimationSchema,
+  px.object({ value: px.number() })
 ]);
 var PxAnimatableVec2Schema = px.union([
   px.tuple([px.number(), px.number()]),
-  px.object({ value: px.tuple([px.number(), px.number()]) }),
-  PxPropertyAnimationSchema
+  PxPropertyAnimationSchema,
+  px.object({ value: px.tuple([px.number(), px.number()]) })
 ]);
 var PxAnimatableStringSchema = px.union([
   px.string(),
-  px.object({ value: px.string() }),
-  PxPropertyAnimationSchema
+  PxPropertyAnimationSchema,
+  px.object({ value: px.string() })
 ]);
 var PxTransformByEffectSchema = implementsInterface()(px.object({
   translate: PxAnimatableVec2Schema.optional(),
@@ -1391,7 +1601,7 @@ var PxRepeaterEffectSchema = implementsInterface()(px.object({
   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(),
@@ -1401,8 +1611,7 @@ var PxMaskedByEffectSchema = implementsInterface()(px.object({
   height: px.number().optional()
 }));
 var PxClipPathEffectSchema = implementsInterface()(px.object({
-  d: PxAnimatableStringSchema.optional(),
-  animate: PxPropertyAnimationSchema.optional()
+  d: PxAnimatableStringSchema.optional()
 }));
 var PxStrokeTrimEffectSchema = implementsInterface()(px.object({
   offset: PxAnimatableNumberSchema.optional(),
@@ -1410,15 +1619,15 @@ var PxStrokeTrimEffectSchema = implementsInterface()(px.object({
   subPaths: px.enum([PxStrokeTrimSubPaths.separate, PxStrokeTrimSubPaths.combined]).optional()
 }));
 var PxRetimeEffectSchema = implementsInterface()(px.object({
-  sourceId: px.string().optional(),
   start: px.number().optional(),
   stretch: px.number().optional(),
   timeCrop: px.tuple([px.number(), px.number()]).optional()
 }));
 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({
@@ -1433,11 +1642,11 @@ var PxAnimatableGradientStopsSchema = px.union([
 var PxFillGradientEffectSchema = implementsInterface()(px.object({
   // Contextual kind — the `type` convention, see `PxNodeBase.type`.
   type: px.enum([PxGradientType.linear, PxGradientType.radial]),
-  p1: PxAnimatableVec2Schema.optional(),
-  p2: PxAnimatableVec2Schema.optional(),
-  c: PxAnimatableVec2Schema.optional(),
-  r: PxAnimatableNumberSchema.optional(),
-  fp: PxAnimatableVec2Schema.optional(),
+  start: PxAnimatableVec2Schema.optional(),
+  end: PxAnimatableVec2Schema.optional(),
+  center: PxAnimatableVec2Schema.optional(),
+  radius: PxAnimatableNumberSchema.optional(),
+  focal: PxAnimatableVec2Schema.optional(),
   stops: PxAnimatableGradientStopsSchema.optional(),
   gradientUnits: px.enum([PxGradientUnits.userSpaceOnUse, PxGradientUnits.objectBoundingBox]).optional(),
   spreadMethod: px.enum([PxGradientSpreadMethod.pad, PxGradientSpreadMethod.reflect, PxGradientSpreadMethod.repeat]).optional(),
@@ -1445,7 +1654,7 @@ var PxFillGradientEffectSchema = implementsInterface()(px.object({
 }));
 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(),
@@ -1485,16 +1694,33 @@ function validateNodeEffects(root, opts) {
   walk(root, "root");
   return warnings;
 }
+function validateDocument(doc) {
+  const ctx = { errors: [], warnings: [], strict: true };
+  const problems = PxAnimatedSvgDocumentSchema.isValid(doc, ctx, ["root"]) ? [] : [...ctx.errors];
+  if (doc && typeof doc === "object") {
+    for (const w of validateNodeEffects(doc, { strict: true })) {
+      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(),
   id: px.string().optional(),
   meta: px.any().optional(),
   // Player-effects bucket emitted by the Editor's lightweight design format.
@@ -1551,7 +1777,7 @@ function deepClone(value) {
   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"]);
@@ -1569,7 +1795,8 @@ function generateNewIds(doc) {
     "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") {
@@ -1586,7 +1813,7 @@ function generateNewIds(doc) {
       }
     }
   }
-  function updateRefs(node) {
+  function updateRefs(node, parentKey) {
     if (!node || typeof node !== "object") return;
     for (const [key, value] of Object.entries(node)) {
       if (key === "children") {
@@ -1606,7 +1833,7 @@ function generateNewIds(doc) {
           }
         } 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) {
@@ -1622,18 +1849,20 @@ function generateNewIds(doc) {
           }
         }
       } 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 [id, anim] of Object.entries(docAnimate)) {
+    for (const [key, anim] of Object.entries(docAnimate)) {
+      const hashed = key.startsWith("#");
+      const id = hashed ? key.slice(1) : key;
       const newId = (_b = idMap.get(id)) != null ? _b : id;
-      updatedAnimate[newId] = anim;
+      updatedAnimate[hashed ? "#" + newId : newId] = anim;
     }
     cloned.animator = __spreadProps2(__spreadValues2({}, cloned.animator), { animateById: updatedAnimate });
   }
@@ -1708,10 +1937,10 @@ function sanitiseAttributeValue(name, value) {
   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;
 }
@@ -1724,16 +1953,16 @@ function getNormalizedProps(props) {
     let value = props[rawKey];
     if (COLOUR_ATTR_NAMES.has(key) && Array.isArray(value)) {
       propsCopy[key] = toRGBA(value);
-    } else if (key === "transform" && value !== null && typeof value === "object" && !Array.isArray(value) && !value.keyframes && !value.kfs) {
+    } else if (key === "transform" && value !== null && typeof value === "object" && !Array.isArray(value) && !value.keyframes) {
       const parts = value.value && typeof value.value === "object" ? value.value : value;
-      propsCopy["transform"] = composeTransformParts(parts, { withUnits: false });
+      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) {
@@ -1743,8 +1972,7 @@ function getNormalizedProps(props) {
   return propsCopy;
 }
 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]];
@@ -1754,31 +1982,27 @@ function getKfTranslate(kf) {
   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, _c;
-  const kfs = (_a = anim.keyframes) != null ? _a : anim.kfs;
+  const kfs = anim.keyframes;
   if (!Array.isArray(kfs)) return false;
   if (anim.autoOrient) return true;
   for (const kf of kfs) {
-    if (((_b = kf.tangentIn) != null ? _b : kf.ti) || ((_c = kf.tangentOut) != null ? _c : kf.to)) return true;
+    if (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);
@@ -1828,14 +2052,14 @@ var DEFAULT_FLATNESS_TOL = 0.5;
 var DEFAULT_ROTATION_TOL = 5;
 var DEFAULT_MAX_SAMPLES = 32;
 function materialiseMotionPathInPropAnim(anim, opts) {
-  var _a, _b, _c, _d;
+  var _a2, _b, _c;
   if (!propAnimIsMotionPath(anim)) return anim;
-  const kfs = (_a = anim.keyframes) != null ? _a : anim.kfs;
+  const kfs = anim.keyframes;
   if (!Array.isArray(kfs) || kfs.length < 2) return anim;
   const autoOrient = !!anim.autoOrient;
-  const flatnessTol = (_b = opts == null ? void 0 : opts.flatnessTolerance) != null ? _b : DEFAULT_FLATNESS_TOL;
-  const rotationTol = (_c = opts == null ? void 0 : opts.rotationTolerance) != null ? _c : DEFAULT_ROTATION_TOL;
-  const maxSamples = (_d = opts == null ? void 0 : opts.maxSamplesPerSegment) != null ? _d : DEFAULT_MAX_SAMPLES;
+  const flatnessTol = (_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 = [];
   const firstPos = getKfTranslate(kfs[0]);
   if (!firstPos) return anim;
@@ -1864,15 +2088,14 @@ function materialiseMotionPathInPropAnim(anim, opts) {
   const lastInE = getKfEasing(kfs[kfs.length - 1]);
   if (lastInE) out[out.length - 1].e = lastInE;
   if (autoOrient) unwrapAutoOrientRotations(out);
-  const result = { kfs: out };
+  const result = { keyframes: out };
   if (anim.loop !== void 0) result.loop = anim.loop;
   return result;
 }
 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;
@@ -1889,8 +2112,7 @@ function makeOutKf(time, value) {
   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;
 }
@@ -1951,9 +2173,8 @@ function wrappedAngleDelta(a, b) {
   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);
@@ -2264,21 +2485,21 @@ function normalizePathValue(value) {
   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);
     }
@@ -2303,9 +2524,9 @@ function resolveElementAnimation(animate, defs) {
   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) };
   }
@@ -2341,11 +2562,11 @@ function interpolateTransformParts(a, b, t) {
   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);
@@ -2353,7 +2574,7 @@ function expandLoopKeyframes(propName, keyframes, loop, duration) {
   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 {
@@ -2366,26 +2587,23 @@ function expandLoopKeyframes(propName, keyframes, loop, duration) {
   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 = [];
@@ -2422,7 +2640,7 @@ function expandLoopKeyframes(propName, keyframes, loop, duration) {
         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) {
@@ -2488,30 +2706,30 @@ function expandLoopKeyframes(propName, keyframes, loop, duration) {
       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) {
@@ -2523,34 +2741,34 @@ function expandLoopKeyframes(propName, keyframes, loop, duration) {
   }
 }
 function normalizeKeyframes(propName, propAnim, duration, defs) {
-  var _a, _b, _c, _d, _e, _f, _g;
-  const keyframes = propAnim.keyframes || propAnim.kfs || [];
+  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;
+      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;
@@ -2569,28 +2787,29 @@ function mergeAnimationDefinitions(animations) {
   return merged;
 }
 function materialiseInternalLoopsInPropAnim(propName, propAnim, duration) {
-  var _a;
   const loopRaw = propAnim.loop;
   if (loopRaw === void 0 || loopRaw === null || loopRaw === false) return propAnim;
   const loop = loopRaw === true ? {} : loopRaw;
-  const rawKfs = (_a = propAnim.keyframes) != null ? _a : propAnim.kfs;
+  const rawKfs = propAnim.keyframes;
   if (!Array.isArray(rawKfs) || rawKfs.length < 2) return propAnim;
   const propNameKebab = isCamelCaseWord(propName) ? camelCaseToKebabWordIfNeeded(propName) : propName;
   const isColour = COLOUR_ATTR_NAMES.has(propNameKebab);
   const kfs = rawKfs.map((kf) => {
-    var _a2, _b, _c, _d, _e, _f, _g, _h;
-    const t = (_a2 = kf.t) != null ? _a2 : kf.time;
-    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 (isColour) 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);
-  const out = { kfs: expanded };
+  const out = { keyframes: expanded };
   if (propAnim.autoOrient !== void 0) out.autoOrient = propAnim.autoOrient;
   return out;
 }
@@ -2632,7 +2851,37 @@ var _elementIdCounter = 0;
 function generateElementId() {
   return "_px_el_" + ++_elementIdCounter;
 }
-function normalizeAnimationDefinition(animDef, duration, defs, engine = PxAnimatorEngine.waapi) {
+function mergeStaticTransformIntoAnimDef(animDef, staticTransform) {
+  if (!animDef) return animDef;
+  const staticParts = staticTransform && typeof staticTransform === "object" && !Array.isArray(staticTransform) ? staticTransform : parseTransformParts(staticTransform);
+  if (!staticParts || !Object.keys(staticParts).length) return animDef;
+  const mergeKfValue = (v) => v && typeof v === "object" && !Array.isArray(v) ? __spreadValues2(__spreadValues2({}, staticParts), v) : v;
+  const transformAnim = animDef[TRANSFORM_ATTR];
+  if (transformAnim && typeof transformAnim === "object") {
+    const anim = transformAnim;
+    if (Array.isArray(anim.keyframes)) {
+      const out = __spreadProps2(__spreadValues2({}, anim), {
+        keyframes: anim.keyframes.map((kf) => __spreadProps2(__spreadValues2({}, kf), { value: mergeKfValue(kf.value) }))
+      });
+      if (out.value !== void 0) out.value = mergeKfValue(out.value);
+      return __spreadProps2(__spreadValues2({}, animDef), { transform: out });
+    }
+    return animDef;
+  }
+  const channels = Object.keys(animDef).filter((k) => TRANSFORM_FN_NAMES.has(k));
+  if (channels.length !== 1) return animDef;
+  const ch = channels[0];
+  const chAnim = animDef[ch];
+  if (!chAnim || typeof chAnim !== "object" || !Array.isArray(chAnim.keyframes)) return animDef;
+  const lifted = __spreadProps2(__spreadValues2({}, chAnim), {
+    keyframes: chAnim.keyframes.map((kf) => __spreadProps2(__spreadValues2({}, kf), { value: __spreadProps2(__spreadValues2({}, staticParts), { [ch]: kf.value }) }))
+  });
+  if (lifted.value !== void 0) lifted.value = __spreadProps2(__spreadValues2({}, staticParts), { [ch]: lifted.value });
+  const rest = __spreadValues2({}, animDef);
+  delete rest[ch];
+  return __spreadProps2(__spreadValues2({}, rest), { transform: lifted });
+}
+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) {
@@ -2640,24 +2889,24 @@ function normalizeAnimationDefinition(animDef, duration, defs, engine = PxAnimat
     }
     const normalizedKfs = normalizeKeyframes(propName, propAnim, duration, defs);
     if (normalizedKfs.length > 0) {
-      const out = { kfs: normalizedKfs };
+      const out = { keyframes: normalizedKfs };
       if (propAnim.autoOrient !== void 0) out.autoOrient = propAnim.autoOrient;
       if (propAnim.loop !== void 0) out.loop = propAnim.loop;
-      normalized[propName] = engine === PxAnimatorEngine.waapi && propName === "transform" ? materialiseMotionPathInPropAnim(out) : out;
+      normalized[propName] = engine === PxTimelineEngine.native && propName === "transform" ? materialiseMotionPathInPropAnim(out) : out;
     }
   }
   return normalized;
 }
-function getNormalisedBindings(doc, engine = PxAnimatorEngine.waapi) {
+function getNormalisedBindings(doc, engine = PxTimelineEngine.native) {
   const animatorConfig = getAnimatorConfig(doc) || {};
   const defs = getDefs(doc);
   const duration = animatorConfig.duration || 1e3;
   const bindings = [];
-  const processAnimation = (id, animate) => {
+  const processAnimation = (id, animate, staticTransform) => {
     if (!animate) return null;
     const animDefs = resolveElementAnimation(animate, defs);
     if (animDefs.length === 0) return null;
-    const merged = mergeAnimationDefinitions(animDefs);
+    const merged = mergeStaticTransformIntoAnimDef(mergeAnimationDefinitions(animDefs), staticTransform);
     const normalizedAnim = normalizeAnimationDefinition(merged, duration, defs, engine);
     if (Object.keys(normalizedAnim).length === 0) return null;
     return {
@@ -2677,7 +2926,7 @@ function getNormalisedBindings(doc, engine = PxAnimatorEngine.waapi) {
     if (inlineAnim && Object.keys(inlineAnim).length > 0) {
       const nodeId = node.id || generateElementId();
       node.id = nodeId;
-      const normalized = processAnimation(nodeId, inlineAnim);
+      const normalized = processAnimation(nodeId, inlineAnim, node.transform);
       if (normalized) bindings.push(normalized);
     }
     if (node.children) {
@@ -2694,12 +2943,12 @@ function getNormalisedBindings(doc, engine = PxAnimatorEngine.waapi) {
   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];
@@ -2714,13 +2963,13 @@ function getKeyframesPair(keyframes, progress) {
   return { prevKf, nextKf };
 }
 function calcPropertyValue(propName, propAnim, progress) {
-  var _a, _b, _c, _d, _e, _f, _g;
-  const keyframes = propAnim.kfs || propAnim.keyframes || [];
+  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);
@@ -2729,11 +2978,11 @@ function calcPropertyValue(propName, propAnim, progress) {
   }
   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,
@@ -2845,13 +3094,13 @@ function deepClonePxNode(value) {
 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) => {
@@ -2859,7 +3108,7 @@ function regenerateIdsAndRewriteRefs(root, genId3) {
     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;
@@ -2871,7 +3120,7 @@ function regenerateIdsAndRewriteRefs(root, genId3) {
         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;
@@ -2881,7 +3130,7 @@ function toFiniteNum(v) {
   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;
@@ -2890,7 +3139,7 @@ function applyUseOffsetToG(gNode) {
   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;
@@ -2898,7 +3147,7 @@ function applyUseOffsetToG(gNode) {
   return gNode;
 }
 function materialiseAnimatedUseInstances(root) {
-  var _a;
+  var _a2;
   const idMap = buildIdMap(root);
   const animatedIds = computeAnimatedSubtreeIds(root, idMap);
   if (animatedIds.size === 0) return root;
@@ -2909,7 +3158,7 @@ function materialiseAnimatedUseInstances(root) {
   const walked = walkAndMaterialise2(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 __spreadProps2(__spreadValues2({}, walked), { children: newChildren });
 }
 function readRootViewport(root) {
@@ -2931,9 +3180,9 @@ function numericAttr(v) {
 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;
@@ -2980,11 +3229,11 @@ function stripHash(href) {
   return href.startsWith("#") ? href.slice(1) : href;
 }
 function materialiseOneUse(useNode, target, idMap, animatedIds, genId3, defsCollector, rootViewport) {
-  var _a, _b, _c, _d;
+  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);
@@ -3053,7 +3302,7 @@ function partsRecord(part, value, origin) {
   return rec;
 }
 function readAnimatable(raw) {
-  var _a, _b, _c;
+  var _a2, _b;
   if (raw === void 0) return {
     kind: "absent"
     /* Absent */
@@ -3061,20 +3310,20 @@ function readAnimatable(raw) {
   if (Array.isArray(raw)) return { kind: "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", keyframes: kfs.map(normaliseKeyframe), autoOrient: obj.autoOrient, loop: obj.loop };
-      const base = (_b = obj.value) != null ? _b : obj.v;
+      const base = (_a2 = obj.value) != null ? _a2 : obj.v;
       if (base !== void 0 && out.kind === "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", value: staticValue };
   }
   return { kind: "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") return;
   if (read.kind === "static") {
@@ -3088,7 +3337,7 @@ function writeAnimatableChannel(node, attrName, read, opts) {
   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) {
@@ -3106,12 +3355,12 @@ function normaliseKeyframe(kf) {
   return out;
 }
 function readStaticOrigin(raw, ctx) {
-  var _a;
+  var _a2;
   const o = readAnimatable(raw);
   if (o.kind === "absent") return void 0;
   if (o.kind === "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 };
@@ -3217,9 +3466,9 @@ function stripHash2(href) {
   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;
@@ -3231,9 +3480,9 @@ function regenerateIdsInClone(root, ctx) {
   return regenerateIdsAndRewriteRefs(root, () => genId(ctx, "retimed"));
 }
 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));
     }
@@ -3258,10 +3507,10 @@ function splitForContentRef(node, transformBy, originalId, innerId, ctx) {
   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);
@@ -3330,7 +3579,7 @@ function liftBodyTranslate(node, transformBy) {
       if (split.rest) node.transform = split.rest;
       else delete node.transform;
     }
-  } else if (node.transform && typeof node.transform === "object" && !Array.isArray(node.transform) && !node.transform.keyframes && !node.transform.kfs) {
+  } else if (node.transform && typeof node.transform === "object" && !Array.isArray(node.transform) && !node.transform.keyframes) {
     const wrapped = node.transform.value;
     const isWrapped = !!(wrapped && typeof wrapped === "object");
     const value = isWrapped ? wrapped : node.transform;
@@ -3463,12 +3712,12 @@ function synthesiseGradientDef(fx, id, ctx) {
     id
   };
   if (fx.type === PxGradientType.linear) {
-    applyGeomVec(out, "x1", "y1", fx.p1);
-    applyGeomVec(out, "x2", "y2", fx.p2);
+    applyGeomVec(out, "x1", "y1", fx.start);
+    applyGeomVec(out, "x2", "y2", fx.end);
   } else {
-    applyGeomVec(out, "cx", "cy", fx.c);
-    applyGeomNumber(out, "r", fx.r);
-    applyGeomVec(out, "fx", "fy", fx.fp);
+    applyGeomVec(out, "cx", "cy", fx.center);
+    applyGeomNumber(out, "r", fx.radius);
+    applyGeomVec(out, "fx", "fy", fx.focal);
   }
   if (fx.gradientUnits) out.gradientUnits = fx.gradientUnits;
   if (fx.spreadMethod) out.spreadMethod = fx.spreadMethod;
@@ -3477,7 +3726,7 @@ function synthesiseGradientDef(fx, id, ctx) {
   return out;
 }
 function applyGeomVec(out, xAttr, yAttr, raw) {
-  var _a, _b, _c;
+  var _a2, _b, _c;
   const read = readAnimatable(raw);
   if (read.kind === "absent") return;
   if (read.kind === "static") {
@@ -3496,7 +3745,7 @@ function applyGeomVec(out, xAttr, yAttr, raw) {
     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;
@@ -3512,7 +3761,7 @@ function applyGeomNumber(out, attrName, raw) {
   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") return [];
@@ -3522,14 +3771,14 @@ function buildStopChildren(stops, ctx) {
   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));
@@ -3542,16 +3791,16 @@ function staticStopNode(s) {
   };
 }
 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);
@@ -3578,13 +3827,12 @@ function animatedStopNode(baseline, kfs, stopIdx, _ctx, loop) {
   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;
@@ -3594,8 +3842,7 @@ function formatOffset(o) {
   return pct + "%";
 }
 function applyClipPathEffect(node, fx, ctx) {
-  var _a, _b;
-  if (!fx || !fx.d && !fx.animate) return node;
+  if (!(fx == null ? void 0 : fx.d)) return node;
   const clipId = genId(ctx, "clip");
   const pathChild = { type: "path" };
   const read = readAnimatable(fx.d);
@@ -3607,11 +3854,6 @@ function applyClipPathEffect(node, fx, ctx) {
       if (pathChild.d !== void 0) pathChild.d = pathString(pathChild.d);
     }
   }
-  if (fx.animate && !((_a = pathChild.animate) == null ? void 0 : _a.d)) {
-    const animate = (_b = pathChild.animate) != null ? _b : {};
-    animate.d = fx.animate;
-    pathChild.animate = animate;
-  }
   ctx.defs.push({ type: "clipPath", id: clipId, children: [pathChild] });
   node.clipPath = "url(#" + clipId + ")";
   return node;
@@ -3623,9 +3865,9 @@ function pathString(v) {
 }
 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");
@@ -3688,16 +3930,16 @@ function invertPartValue(part, value) {
   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;
@@ -3706,7 +3948,7 @@ function wrapInverseAnimatedBodyTransform(inner, node, _ctx) {
   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(__spreadProps2(__spreadValues2(__spreadValues2({}, baseKf), negatedSpatialTangents(kf)), { value: { translate: [-v.translate[0], -v.translate[1]] } }));
@@ -3754,7 +3996,7 @@ function readTransformationFromBody(node) {
     if (parts.origin) out.origin = parts.origin;
     return Object.keys(out).length ? out : void 0;
   }
-  if (node.transform && typeof node.transform === "object" && !node.transform.keyframes && !node.transform.kfs) {
+  if (node.transform && typeof node.transform === "object" && !node.transform.keyframes) {
     const wrapped = node.transform.value;
     const value = wrapped && typeof wrapped === "object" ? wrapped : node.transform;
     if (value && typeof value === "object") {
@@ -3770,7 +4012,7 @@ function readTransformationFromBody(node) {
   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 = [];
@@ -3784,7 +4026,7 @@ function parseTransformStringToParts(s) {
     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;
@@ -3899,8 +4141,8 @@ function interpKfs(kfs, t) {
 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);
@@ -3921,7 +4163,7 @@ function collectMaskAncestorChains(root, ctx) {
   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;
@@ -3929,7 +4171,7 @@ function extractTranslateOnly(node, ctx) {
   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)) {
@@ -3943,7 +4185,7 @@ function extractTranslateOnly(node, ctx) {
     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] });
@@ -3976,15 +4218,14 @@ function parseTranslateOnlyFromString(s, ctx) {
   if (droppedNonTranslate) ctx.warnings.push("maskedBy ancestor: non-translate transform in string ignored: " + s);
   return seen ? [x, y] : void 0;
 }
-var CONTENT_SUBREF = "content";
 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) {
@@ -3992,9 +4233,9 @@ function applyRefAndTransformationEffect(node, clone2, transformBy, ctx) {
   return applyTransformByEffect(node, transformBy, ctx);
 }
 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;
@@ -4062,8 +4303,8 @@ function synthesiseScale(raw, i) {
 }
 var RETIME_MATERIALISATION_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) {
@@ -4091,12 +4332,12 @@ function concatRetime(child, parent) {
   };
 }
 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;
@@ -4107,9 +4348,9 @@ function applyAllRetimeEffects(root, ctx) {
   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();
@@ -4117,7 +4358,7 @@ function applyAllRetimeEffects(root, ctx) {
     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) {
@@ -4127,7 +4368,7 @@ function applyAllRetimeEffects(root, ctx) {
           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) {
@@ -4137,8 +4378,8 @@ function applyAllRetimeEffects(root, ctx) {
     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);
@@ -4205,7 +4446,7 @@ function buildChainClone(targetId, accum, ctx, chain) {
 }
 function materialiseNestedRetimeUses(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);
@@ -4218,14 +4459,14 @@ function materialiseNestedRetimeUses(node, accum, ctx, chain, parentTargetId) {
       }
       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) => {
@@ -4400,8 +4641,8 @@ function numRange(v) {
 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, _b;
+    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;
     if (typeof t === "string") chars += t.length;
@@ -4425,14 +4666,14 @@ function shiftAnimatable(v, by) {
   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;
@@ -4453,10 +4694,10 @@ function extendedPathForBrowser(pathD, opts) {
   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,
@@ -4466,7 +4707,7 @@ function applyTextPathEffect(node, fx, ctx) {
   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;
@@ -4590,15 +4831,15 @@ function paintAnimateOf(node) {
   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,
@@ -4615,10 +4856,10 @@ function resolveStyle2(node, parent) {
   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,
@@ -4639,9 +4880,9 @@ function paintOf(s) {
   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) {
@@ -4663,19 +4904,19 @@ function missingGlyphBoxEm(advanceEm, ascentEm) {
   return outer + "M" + ix0 + " " + iyb + "L" + ix0 + " " + iyt + "L" + ix1 + " " + iyt + "L" + ix1 + " " + iyb + "Z";
 }
 function materialiseGlyphTextHorizontal(node, opts) {
-  var _a, _b, _c, _d;
+  var _a2, _b, _c, _d;
   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);
@@ -4695,7 +4936,7 @@ function materialiseGlyphTextHorizontal(node, opts) {
     }
   };
   const walk = (el, parentStyle) => {
-    var _a2, _b2, _c2, _d2;
+    var _a3, _b2, _c2, _d2;
     const s = resolveStyle2(el, parentStyle);
     const x = parseLen(el.x);
     const y = parseLen(el.y);
@@ -4705,7 +4946,7 @@ function materialiseGlyphTextHorizontal(node, opts) {
       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);
@@ -4726,8 +4967,8 @@ function materialiseGlyphTextHorizontal(node, opts) {
   return toGroup(node, buildPaths(placements, create, warnings), create);
 }
 function layoutGlyphTextChars(node, opts) {
-  var _a, _b, _c, _d, _e, _f;
-  if ((_a = opts.alongPath) == null ? void 0 : _a.pathD) return layoutGlyphTextCharsAlongPath(node, opts.alongPath.pathD, opts);
+  var _a2, _b, _c, _d, _e, _f;
+  if ((_a2 = opts.alongPath) == null ? void 0 : _a2.pathD) return layoutGlyphTextCharsAlongPath(node, opts.alongPath.pathD, opts);
   const { glyphs, warnings } = opts;
   const soleFont = soleFontOf(glyphs);
   const pen = { x: (_b = parseLen(node.x)) != null ? _b : 0, y: (_c = parseLen(node.y)) != null ? _c : 0 };
@@ -4735,11 +4976,11 @@ function layoutGlyphTextChars(node, opts) {
   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 ascent = ((_a2 = gf == null ? void 0 : gf.ascent) != null ? _a2 : 0.9 * upm) * scale;
+    const ascent = ((_a3 = gf == null ? void 0 : gf.ascent) != null ? _a3 : 0.9 * upm) * scale;
     for (let i = 0; i < content.length; i++) {
       const ch = content.charAt(i);
       const g = gf == null ? void 0 : gf.glyphs[ch];
@@ -4750,7 +4991,7 @@ function layoutGlyphTextChars(node, opts) {
     }
   };
   const walk = (el, parentStyle) => {
-    var _a2, _b2, _c2, _d2;
+    var _a3, _b2, _c2, _d2;
     const s = resolveStyle2(el, parentStyle);
     const x = parseLen(el.x);
     const y = parseLen(el.y);
@@ -4760,7 +5001,7 @@ function layoutGlyphTextChars(node, opts) {
       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);
@@ -4792,7 +5033,7 @@ function layoutGlyphTextChars(node, opts) {
   });
 }
 function layoutGlyphTextCharsAlongPath(node, pathD, opts) {
-  var _a, _b;
+  var _a2, _b;
   const { glyphs, warnings, alongPath } = opts;
   const sampler = createPathSampler(pathD);
   if (!sampler) {
@@ -4803,9 +5044,9 @@ function layoutGlyphTextCharsAlongPath(node, pathD, opts) {
   const chars = [];
   let adv = 0;
   const walk = (el, parentStyle) => {
-    var _a2, _b2, _c;
+    var _a3, _b2, _c;
     const s = resolveStyle2(el, parentStyle);
-    const content = (_a2 = str(el[TEXT_CONTENT_ATTR])) != null ? _a2 : str(el[TEXT_ATTR]);
+    const content = (_a3 = str(el[TEXT_CONTENT_ATTR])) != null ? _a3 : str(el[TEXT_ATTR]);
     if (content && !((_b2 = el.children) == null ? void 0 : _b2.length)) {
       const gf = glyphFontFor(s, glyphs, soleFont, warnings);
       const upm = (gf == null ? void 0 : gf.unitsPerEm) || 1e3;
@@ -4825,7 +5066,7 @@ function layoutGlyphTextCharsAlongPath(node, pathD, opts) {
   walk(node, rootStyleOf(node));
   const width = adv;
   const tlr = readAnimatable(alongPath == null ? void 0 : alongPath.textLength);
-  const tlv = tlr.kind === "animated" ? Number((_a = tlr.keyframes[0]) == null ? void 0 : _a.value) || 0 : tlr.kind === "static" ? Number(tlr.value) || 0 : 0;
+  const tlv = tlr.kind === "animated" ? Number((_a2 = tlr.keyframes[0]) == null ? void 0 : _a2.value) || 0 : tlr.kind === "static" ? Number(tlr.value) || 0 : 0;
   const k = tlv > 0 && width > 0 ? tlv / width : 1;
   const so = readAnimatable(alongPath == null ? void 0 : alongPath.startOffset);
   const { along: alongOffset, perp } = alongPathNodeOffsets(node);
@@ -4857,9 +5098,9 @@ function collectAlongPathCells(node, glyphs, soleFont, warnings) {
   const cells = [];
   let adv = 0;
   const walk = (el, parentStyle) => {
-    var _a, _b, _c;
+    var _a2, _b, _c;
     const s = resolveStyle2(el, parentStyle);
-    const content = (_a = str(el[TEXT_CONTENT_ATTR])) != null ? _a : str(el[TEXT_ATTR]);
+    const content = (_a2 = str(el[TEXT_CONTENT_ATTR])) != null ? _a2 : str(el[TEXT_ATTR]);
     if (content && !((_b = el.children) == null ? void 0 : _b.length)) {
       const gf = glyphFontFor(s, glyphs, soleFont, warnings);
       if (gf) {
@@ -4896,9 +5137,9 @@ function alongAffine(sampler, dist, scale, widthEm, perp = 0) {
   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
   };
 }
@@ -4938,7 +5179,7 @@ function materialiseGlyphTextAlongPath(node, pathD, startOffset, opts, textLengt
   return toGroup(node, buildPaths(placements, create, warnings), create);
 }
 function numTrackOf(raw) {
-  var _a;
+  var _a2;
   const r = readAnimatable(raw);
   if (r.kind === "animated" && r.keyframes.length >= 2) {
     const kfs = [...r.keyframes].sort((k1, k2) => (Number(k1.time) || 0) - (Number(k2.time) || 0));
@@ -4961,7 +5202,7 @@ function numTrackOf(raw) {
       }
     };
   }
-  const v = r.kind === "animated" ? Number((_a = r.keyframes[0]) == null ? void 0 : _a.value) || 0 : r.kind === "static" ? Number(r.value) || 0 : 0;
+  const v = r.kind === "animated" ? Number((_a2 = r.keyframes[0]) == null ? void 0 : _a2.value) || 0 : r.kind === "static" ? Number(r.value) || 0 : 0;
   return { animated: false, times: [], at: () => v };
 }
 function mergeTrackTimes(a, b) {
@@ -5043,7 +5284,7 @@ function paintProps(paint) {
   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) {
@@ -5087,14 +5328,14 @@ function materialiseGlyphText(node, opts) {
 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 });
 }
 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);
@@ -5234,12 +5475,11 @@ function getOffsetIndexRange(minMaxOffset) {
   ];
 }
 function readScalarValues(r) {
-  var _a;
   if (r.kind === "absent") return [];
   if (r.kind === "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;
@@ -5249,14 +5489,11 @@ function computeAnimAttr(read, map) {
   if (read.kind === "static") return { kind: "static", value: map(read.value) };
   return {
     kind: "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
   };
 }
@@ -5266,7 +5503,6 @@ function applyAttr(node, attrName, attr) {
 }
 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") return void 0;
   if (rangeRead.kind === "static") return hide(rangeRead.value) ? { kind: "static", value: 0 } : void 0;
@@ -5274,7 +5510,7 @@ function computeOpacityFromRange(rangeRead) {
   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;
@@ -5284,10 +5520,10 @@ function computeOpacityFromRange(rangeRead) {
     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 });
@@ -5302,14 +5538,11 @@ function computeOpacityFromRange(rangeRead) {
 function readRangeWithCrossings(raw) {
   const r = readAnimatable(raw);
   if (r.kind !== "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 {
@@ -5406,20 +5639,20 @@ function pxBezierPathLength(path) {
   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";
   }
@@ -5435,7 +5668,7 @@ function shapeToPathD(node) {
   return void 0;
 }
 function applyPlayerEffects(root) {
-  var _a, _b;
+  var _a2, _b;
   const ctx = {
     defs: [],
     warnings: [],
@@ -5446,8 +5679,8 @@ function applyPlayerEffects(root) {
     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);
@@ -5470,7 +5703,7 @@ function applyPlayerEffects_exceptRetime(node, ctx) {
   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;
@@ -5502,26 +5735,6 @@ function applyPlayerEffects_retime(node, ctx) {
   applyAllRetimeEffects(node, ctx);
   return node;
 }
-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;
-};
 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;
@@ -5545,9 +5758,9 @@ var fmt2 = (n) => {
   return Object.is(r, -0) ? "0" : String(r);
 };
 function buildOffsetPath(propAnim) {
-  var _a, _b, _c, _d;
+  var _a2, _b, _c;
   if (propAnim.alongPathMode !== "offsetPath") return void 0;
-  const kfs = (_a = propAnim.keyframes) != null ? _a : propAnim.kfs;
+  const kfs = propAnim.keyframes;
   if (!kfs || kfs.length < 2) return void 0;
   const first = kfValue(kfs[0]);
   const anchor = (first == null ? void 0 : first.origin) && first.origin.length >= 2 ? [first.origin[0], first.origin[1]] : [0, 0];
@@ -5558,7 +5771,7 @@ function buildOffsetPath(propAnim) {
     if (!tr || tr.length < 2) return void 0;
     const parts = Object.keys(v);
     if (parts.some((p) => p !== "translate" && p !== "origin")) return void 0;
-    const o = (_b = v == null ? void 0 : v.origin) != null ? _b : [0, 0];
+    const o = (_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]]);
   }
@@ -5567,8 +5780,8 @@ function buildOffsetPath(propAnim) {
   const segLens = [];
   for (let i = 0; i < points.length - 1; i++) {
     const p0 = points[i], p1 = points[i + 1];
-    const to = (_c = kfTangentOut(kfs[i])) != null ? _c : [0, 0];
-    const ti = (_d = kfTangentIn(kfs[i + 1])) != null ? _d : [0, 0];
+    const to = (_b = kfTangentOut(kfs[i])) != null ? _b : [0, 0];
+    const ti = (_c = kfTangentIn(kfs[i + 1])) != null ? _c : [0, 0];
     const c1 = [p0[0] + to[0], p0[1] + to[1]];
     const c2 = [p1[0] + ti[0], p1[1] + ti[1]];
     d += "C" + fmt2(c1[0]) + "," + fmt2(c1[1]) + "," + fmt2(c2[0]) + "," + fmt2(c2[1]) + "," + fmt2(p1[0]) + "," + fmt2(p1[1]);
@@ -5589,7 +5802,7 @@ function buildOffsetPath(propAnim) {
 }
 function materialiseOffsetPathsInTree(root) {
   const walk = (node) => {
-    var _a;
+    var _a2;
     let out = node;
     const anim = node.animate;
     const transform = anim == null ? void 0 : anim["transform"];
@@ -5597,16 +5810,16 @@ function materialiseOffsetPathsInTree(root) {
       const built = buildOffsetPath(transform);
       if (built) {
         const newAnimate = __spreadValues2({}, 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 = __spreadValues2({}, 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 = __spreadProps2(__spreadValues2({}, node), {
@@ -5622,7 +5835,7 @@ function materialiseOffsetPathsInTree(root) {
         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 = __spreadProps2(__spreadValues2({}, out), { children });
     }
@@ -5631,12 +5844,12 @@ function materialiseOffsetPathsInTree(root) {
   return walk(root);
 }
 function materialiseAllInTree(doc, engine, opts) {
-  var _a, _b;
+  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;
+  const duration = (_b = (_a2 = getAnimatorConfig(root)) == null ? void 0 : _a2.duration) != null ? _b : DEFAULT_DURATION_MS;
   root = materialiseInternalLoopsInTree(root, duration);
-  if (engine === PxAnimatorEngine.waapi) {
+  if (engine === PxTimelineEngine.native) {
     root = materialiseMotionPathsInTree(root, opts == null ? void 0 : opts.motionPath);
     root = materialiseAnimatedUseInstances(root);
     root = pruneUnreferencedDefs(root);
@@ -5646,9 +5859,9 @@ function materialiseAllInTree(doc, engine, opts) {
 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) {
@@ -5686,9 +5899,9 @@ function cancelFrame(handle) {
   g.clearTimeout(handle);
 }
 function createBasicFrameLoopAnimator(doc, adapter, callbacks) {
-  var _a;
+  var _a2;
   const config = getAnimatorConfig(doc) || {};
-  const bindings = getNormalisedBindings(doc, PxAnimatorEngine.frames);
+  const bindings = getNormalisedBindings(doc, PxTimelineEngine.js);
   const _iterations = config.iterations;
   let iterations = 1;
   if (typeof _iterations === "number") iterations = _iterations || 1;
@@ -5697,7 +5910,7 @@ function createBasicFrameLoopAnimator(doc, adapter, callbacks) {
   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;
@@ -5759,7 +5972,7 @@ function createBasicFrameLoopAnimator(doc, adapter, callbacks) {
     }
   }
   const tick = () => {
-    var _a2, _b;
+    var _a3, _b;
     if (!adapter.isConnected()) {
       pauseAnim();
       return;
@@ -5775,7 +5988,7 @@ function createBasicFrameLoopAnimator(doc, adapter, callbacks) {
       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;
     }
@@ -5867,17 +6080,17 @@ function createBasicFrameLoopAnimator(doc, adapter, callbacks) {
     }
   };
   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 {
@@ -5892,7 +6105,7 @@ function createBasicFrameLoopAnimator(doc, adapter, callbacks) {
     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 = {
@@ -5902,14 +6115,14 @@ function createBasicFrameLoopAnimator(doc, adapter, callbacks) {
       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();
@@ -5941,9 +6154,9 @@ function createBasicFrameLoopAnimator(doc, adapter, callbacks) {
       renderFrame(getAnimCurrentTime());
     },
     "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;
@@ -5997,9 +6210,9 @@ function lerp(a, b, f) {
   return a + (b - a) * f;
 }
 function interpParts(kfs, t) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a2, _b, _c, _d, _e, _f, _g;
   if (!kfs.length) return {};
-  if (t <= ((_a = kfs[0].time) != null ? _a : 0)) return kfs[0].value || {};
+  if (t <= ((_a2 = kfs[0].time) != null ? _a2 : 0)) return kfs[0].value || {};
   if (t >= ((_b = kfs[kfs.length - 1].time) != null ? _b : 0)) return kfs[kfs.length - 1].value || {};
   let i = 0;
   while (i < kfs.length - 1 && ((_c = kfs[i + 1].time) != null ? _c : 0) < t) i++;
@@ -6030,10 +6243,10 @@ function nodeMatrix(node, t) {
   return IDENTITY;
 }
 function evalScalar(animated, staticVal, fallback, t) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a2, _b, _c, _d, _e, _f;
   if (animated && animated.keyframes && animated.keyframes.length) {
     const kfs = animated.keyframes;
-    if (t <= ((_a = kfs[0].time) != null ? _a : 0)) return kfs[0].value;
+    if (t <= ((_a2 = kfs[0].time) != null ? _a2 : 0)) return kfs[0].value;
     if (t >= ((_b = kfs[kfs.length - 1].time) != null ? _b : 0)) return kfs[kfs.length - 1].value;
     let i = 0;
     while (i < kfs.length - 1 && ((_c = kfs[i + 1].time) != null ? _c : 0) < t) i++;
@@ -6046,9 +6259,9 @@ function evalScalar(animated, staticVal, fallback, t) {
 var CONTAINER_TYPES = /* @__PURE__ */ new Set(["svg", "g", "symbol"]);
 var SKIP_TYPES = /* @__PURE__ */ new Set(["defs", "mask", "clipPath", "title"]);
 function buildIdMap2(node, map) {
-  var _a;
+  var _a2;
   if (typeof node.id === "string") map.set(node.id, node);
-  (_a = node.children) == null ? void 0 : _a.forEach((c) => buildIdMap2(c, map));
+  (_a2 = node.children) == null ? void 0 : _a2.forEach((c) => buildIdMap2(c, map));
 }
 function num(v) {
   return v === void 0 || v === null ? 0 : Number(v);
@@ -6057,7 +6270,7 @@ function round(n) {
   return Math.round(n * 100) / 100 + 0;
 }
 function geomKey(node) {
-  var _a;
+  var _a2;
   switch (node.type) {
     case "rect":
       return num(node.width) + "," + num(node.height) + "," + num(node.x) + "," + num(node.y);
@@ -6066,14 +6279,14 @@ function geomKey(node) {
     case "circle":
       return num(node.r) + "," + num(node.cx) + "," + num(node.cy);
     case "path":
-      return String((_a = node.d) != null ? _a : "");
+      return String((_a2 = node.d) != null ? _a2 : "");
     default:
       return "";
   }
 }
 function describePrimitive(node, m, t) {
-  var _a, _b, _c, _d, _e;
-  const fill = (_a = node.fill) != null ? _a : "";
+  var _a2, _b, _c, _d, _e;
+  const fill = (_a2 = node.fill) != null ? _a2 : "";
   const stroke = (_b = node.stroke) != null ? _b : "";
   const sw = (_d = (_c = node["stroke-width"]) != null ? _c : node.strokeWidth) != null ? _d : "";
   const opacity = round(evalScalar((_e = node.animate) == null ? void 0 : _e.opacity, node.opacity, 1, t));
@@ -6082,7 +6295,7 @@ function describePrimitive(node, m, t) {
   return node.type + "|" + geomKey(node) + "|[" + mat + "]|f:" + fill + "|s:" + stroke + "|sw:" + (num(sw) || "") + "|o:" + opacity + "|m:" + masked;
 }
 function flatten(node, parent, t, idMap, out) {
-  var _a;
+  var _a2;
   const type = node.type || "";
   if (SKIP_TYPES.has(type)) return;
   const m = mul(parent, nodeMatrix(node, t));
@@ -6095,33 +6308,33 @@ function flatten(node, parent, t, idMap, out) {
     return;
   }
   if (CONTAINER_TYPES.has(type)) {
-    (_a = node.children) == null ? void 0 : _a.forEach((c) => flatten(c, m, t, idMap, out));
+    (_a2 = node.children) == null ? void 0 : _a2.forEach((c) => flatten(c, m, t, idMap, out));
     return;
   }
   out.push(describePrimitive(node, m, t));
 }
 function collectSampleTimes(node, into) {
-  var _a;
+  var _a2;
   into.add(0);
   const scanAnim = (anim) => {
-    var _a2;
+    var _a3;
     if (!anim || typeof anim !== "object") return;
     for (const key of Object.keys(anim)) {
-      const kfs = (_a2 = anim[key]) == null ? void 0 : _a2.keyframes;
+      const kfs = (_a3 = anim[key]) == null ? void 0 : _a3.keyframes;
       if (Array.isArray(kfs)) kfs.forEach((kf) => {
-        var _a3;
-        return into.add((_a3 = kf.time) != null ? _a3 : 0);
+        var _a4;
+        return into.add((_a4 = kf.time) != null ? _a4 : 0);
       });
     }
   };
   scanAnim(node.animate);
   if (node.transform && typeof node.transform === "object" && node.transform.keyframes) {
     node.transform.keyframes.forEach((kf) => {
-      var _a2;
-      return into.add((_a2 = kf.time) != null ? _a2 : 0);
+      var _a3;
+      return into.add((_a3 = kf.time) != null ? _a3 : 0);
     });
   }
-  (_a = node.children) == null ? void 0 : _a.forEach((c) => collectSampleTimes(c, into));
+  (_a2 = node.children) == null ? void 0 : _a2.forEach((c) => collectSampleTimes(c, into));
 }
 function visualModelAt(root, t) {
   const idMap = /* @__PURE__ */ new Map();
@@ -6155,8 +6368,191 @@ function subtractMultiset(a, b) {
   }
   return extra;
 }
+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) ? __spreadValues2({}, 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 foldAnimatorConfigShortcuts(config, shortcuts) {
+  let base;
+  if (typeof config === "string") {
+    try {
+      base = JSON.parse(config);
+    } catch (e) {
+      console.warn("animator config: not valid JSON \u2014 ignored", e);
+      base = void 0;
+    }
+  } else {
+    base = config != null ? config : void 0;
+  }
+  const { duration, delay, iterations, startOn } = shortcuts;
+  if (duration === void 0 && delay === void 0 && iterations === void 0 && startOn === void 0) {
+    return base;
+  }
+  const out = isPlainObject(base) ? __spreadValues2({}, base) : {};
+  const timeline = __spreadValues2({}, out.timeline);
+  if (duration !== void 0) timeline.duration = duration;
+  if (delay !== void 0) timeline.delay = delay;
+  if (iterations !== void 0) timeline.iterations = iterations;
+  if (startOn !== void 0) {
+    timeline.trigger = __spreadProps2(__spreadValues2({}, timeline.trigger), { startOn });
+  }
+  out.timeline = timeline;
+  return 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) ? __spreadValues2({}, 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: __spreadProps2(__spreadValues2({}, anyDoc), { meta: __spreadProps2(__spreadValues2({}, anyDoc.meta), { animator: merged.config }) }),
+      warnings
+    };
+  }
+  return { doc: __spreadProps2(__spreadValues2({}, anyDoc), { animator: merged.config }), warnings };
+}
+var MAX_REPORTED = 6;
+var LEGACY_FLAT_KEYS = [
+  ...PX_TIMELINE_SHARED_KEYS,
+  ...PX_TIME_ONLY_TIMELINE_KEYS,
+  "fill",
+  "resetOnFinish",
+  "timelineSource",
+  "scroll"
+];
+var isLegacyFlatAnimatorKey = (w) => LEGACY_FLAT_KEYS.some((k) => w.indexOf("animator." + k + ":") >= 0);
+function diagnoseDocument(doc) {
+  let all;
+  try {
+    all = validateDocument(doc);
+  } catch (e) {
+    return { problems: [], legacy: [] };
+  }
+  const problems = [];
+  const legacy = [];
+  for (const w of all) (isLegacyFlatAnimatorKey(w) ? legacy : problems).push(w);
+  return { problems, legacy };
+}
+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/PxAnimatorTriggers.ts
+// src/triggers/PxAnimatorTriggers.ts
 function setupAnimationTriggers(api, config) {
   const { startOn, outAction = "continue", scrollIntoViewThreshold = 0 } = config;
   const root = api.getRootElement();
@@ -6226,12 +6622,12 @@ function setupAnimationTriggers(api, config) {
     }
     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;
@@ -6261,7 +6657,7 @@ function setupAnimationTriggers(api, config) {
   return api;
 }
 
-// src/PxAnimatorFrameLoop.ts
+// src/engines/PxAnimatorFrameLoop.ts
 function getSelector(id) {
   return "#" + id;
 }
@@ -6321,11 +6717,10 @@ function createDomAdapter(rootElement) {
   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
@@ -6359,11 +6754,11 @@ function createCssKf(kf, t, propName, unsupportedSet) {
   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) {
@@ -6392,15 +6787,15 @@ function clipKeyframesToDuration(propName, keyframes, duration) {
   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;
-    const clippedKeyframes = clipKeyframesToDuration(propName, propAnim.kfs || propAnim.keyframes || [], duration);
+    const clippedKeyframes = clipKeyframesToDuration(propName, propAnim.keyframes || [], duration);
     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 }));
@@ -6419,7 +6814,7 @@ function convertToWebApiKeyframes(animDef, unsupportedSet, config) {
   return result;
 }
 function createWebApiAnimator(doc, callbacks, rootElement, forceEvenIfHasUnsupportedAttrs, scrollTimeline) {
-  var _a;
+  var _a2;
   const config = getAnimatorConfig(doc) || {};
   if (!rootElement) {
     if (doc.id) {
@@ -6430,7 +6825,7 @@ function createWebApiAnimator(doc, callbacks, rootElement, forceEvenIfHasUnsuppo
       console.warn("createFrameLoopAnimator: No root element provided");
     }
   }
-  const bindings = getNormalisedBindings(doc, PxAnimatorEngine.waapi);
+  const bindings = getNormalisedBindings(doc, PxTimelineEngine.native);
   const animations = [];
   const _iterations = config.iterations;
   let iterations;
@@ -6467,7 +6862,7 @@ function createWebApiAnimator(doc, callbacks, rootElement, forceEvenIfHasUnsuppo
       // 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
     };
@@ -6484,16 +6879,16 @@ function createWebApiAnimator(doc, callbacks, rootElement, forceEvenIfHasUnsuppo
               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;
@@ -6514,31 +6909,31 @@ function createWebApiAnimator(doc, callbacks, rootElement, forceEvenIfHasUnsuppo
     "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 });
@@ -6555,8 +6950,8 @@ function createWebApiAnimator(doc, callbacks, rootElement, forceEvenIfHasUnsuppo
       return api;
     },
     "getCurrentTime": () => {
-      var _a2, _b;
-      const res = (_b = (_a2 = animations[0]) == null ? void 0 : _a2.currentTime) != null ? _b : null;
+      var _a3, _b;
+      const res = (_b = (_a3 = animations[0]) == null ? void 0 : _a3.currentTime) != null ? _b : null;
       return res !== null ? +res : null;
     },
     "setCurrentTime": (time) => {
@@ -6566,12 +6961,12 @@ function createWebApiAnimator(doc, callbacks, rootElement, forceEvenIfHasUnsuppo
       });
     },
     "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);
       }
     }
   };
@@ -6588,21 +6983,21 @@ function createWebApiAnimator(doc, callbacks, rootElement, forceEvenIfHasUnsuppo
   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;
+  var _a2, _b, _c, _d;
   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"`');
+    console.warn("scroll timeline: `smoothing` needs the built-in driver \u2014 using the built-in driver instead of the browser timeline");
     return null;
   }
   const g = globalThis;
@@ -6619,7 +7014,7 @@ function createNativeScrollTimeline(subject, config) {
       timeline = new Ctor({ source, axis });
     }
   } catch (e) {
-    console.warn("scroll timeline: native timeline construction failed \u2014 falling back to the custom driver", e);
+    console.warn("scroll timeline: native timeline construction failed \u2014 falling back to the player measuring progress itself", e);
     return null;
   }
   return {
@@ -6647,7 +7042,7 @@ function documentScroller() {
 var SUBJECT_PARENT = "parent";
 var SUBJECT_SCROLLER = "scroller";
 function resolveScrollSubject(svgRoot, subject) {
-  var _a, _b;
+  var _a2, _b;
   const spec = subject == null ? void 0 : subject.trim();
   if (!spec) return svgRoot;
   if (spec === SUBJECT_PARENT) {
@@ -6656,7 +7051,7 @@ function resolveScrollSubject(svgRoot, subject) {
       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();
@@ -6675,10 +7070,10 @@ function resolveScrollSubject(svgRoot, subject) {
   return found;
 }
 function createScrollDriver(subject, config, onProgress) {
-  var _a, _b;
+  var _a2, _b;
   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";
   const measured = resolveScrollSubject(subject, scroll.subject);
   const nearest = findNearestScroller(subject, "y") || findNearestScroller(subject, "x");
   const scroller = kind === "scroll" && scroll.source === "root" ? documentScroller() : nearest || documentScroller();
@@ -6797,8 +7192,8 @@ function applyScrollPin(svgRoot, scroll) {
   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.pinTop) != null ? _a2 : 0;
     if (!alignFactor) {
       style.top = extra + "px";
       return;
@@ -6838,23 +7233,23 @@ function applyScrollPin(svgRoot, scroll) {
   };
 }
 
-// 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;
 }
@@ -6862,10 +7257,10 @@ function bindWithEngineChoice(doc, adapter, callbacks, rootElement) {
   const animatorConfig = getAnimatorConfig(doc) || {};
   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);
         if (native) {
@@ -6873,7 +7268,7 @@ function bindWithEngineChoice(doc, adapter, callbacks, rootElement) {
             doc,
             cb,
             rootElement,
-            animatorConfig.mode === PxAnimatorMode.waapi,
+            isNativeForced(animatorConfig.engine),
             native
           );
           if (api2) {
@@ -6889,8 +7284,8 @@ function bindWithEngineChoice(doc, adapter, callbacks, rootElement) {
         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);
@@ -6914,20 +7309,19 @@ function bindWithEngineChoice(doc, adapter, callbacks, rootElement) {
     });
   }
   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) {
   if (DISALLOWED_SVG_TAGS_LOWER.has(tagName.toLowerCase())) {
@@ -6959,7 +7353,7 @@ function createElement(tagName, normalisedProps, style, children, textContent) {
 }
 function renderNode(node, defs) {
   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;
@@ -6985,18 +7379,24 @@ function renderNode(node, defs) {
   return element;
 }
 
-// src/PxAnimatorKeys.ts
+// src/shared/PxAnimatorKeys.ts
 var PX_ANIMATOR_DATA_KEY = "data";
 
-// 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, config, resetDocDefaults) {
   const effectsWarnings = validateNodeEffects(doc);
   for (const w of effectsWarnings) console.warn("[PxAnimator] effects shape warning:", w);
+  reportDocumentDiagnostics(doc, "[PxAnimator] createAnimator");
+  if (config !== void 0 || resetDocDefaults) {
+    const patched = applyAnimatorConfig(doc, config != null ? config : {}, { resetDefaults: !!resetDocDefaults });
+    for (const w of patched.warnings) console.warn("[PxAnimator] config override:", w);
+    doc = patched.doc;
+  }
   const animatorConfig = getAnimatorConfig(doc) || {};
-  const engine = animatorConfig.mode === PxAnimatorMode.frames ? PxAnimatorEngine.frames : PxAnimatorEngine.waapi;
+  const engine = resolveTimelineEngine(animatorConfig.engine);
   doc = materialiseAllInTree(doc, engine);
   let rootElement = null;
   if (containerElement) {
@@ -7009,10 +7409,24 @@ function createAnimatorImpl(doc, adapter, callbacks, containerElement) {
       }
     }
   }
-  return createAnimatorFromConfig(doc, adapter, callbacks, rootElement);
+  const api = createAnimatorFromConfig(doc, adapter, callbacks, rootElement);
+  if (containerElement && rootElement) {
+    const rendered = rootElement;
+    const destroyNative = api.destroy.bind(api);
+    api.destroy = () => {
+      destroyNative();
+      rendered.remove();
+    };
+  }
+  return api;
+}
+function resolveAnimatorConfigOption(options) {
+  const { config, duration, delay, iterations, startOn } = options;
+  return foldAnimatorConfigShortcuts(config, { duration, delay, iterations, startOn });
 }
 function createAnimator(options) {
-  const { src, data, adapter, callbacks, container } = options;
+  const { src, data, adapter, callbacks, container, resetDocDefaults } = options;
+  const config = resolveAnimatorConfigOption(options);
   if (data !== void 0 && src !== void 0) {
     throw new Error("createAnimator: provide either `src` or `data`, not both");
   }
@@ -7020,7 +7434,7 @@ function createAnimator(options) {
     throw new Error("createAnimator: either `src` or `data` is required");
   }
   if (data !== void 0) {
-    return createAnimatorImpl(data, adapter, callbacks, container);
+    return createAnimatorImpl(data, adapter, callbacks, container, config, resetDocDefaults);
   }
   let animator = null;
   let pending = [];
@@ -7035,7 +7449,7 @@ function createAnimator(options) {
   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, config, resetDocDefaults);
       const queued = pending;
       pending = null;
       queued == null ? void 0 : queued.forEach((call) => call(animator));
@@ -7104,12 +7518,11 @@ if (typeof window !== "undefined") {
   PxAnimatedSvgDocumentSchema,
   PxAnimationDefinitionSchema,
   PxAnimatorConfigSchema,
-  PxAnimatorEngine,
-  PxAnimatorMode,
   PxAttrValueSchema,
   PxBezierPathSchema,
   PxBindingSchema,
   PxCloneEffectSchema,
+  PxCloneWithout,
   PxDefsSchema,
   PxEasingOrRefSchema,
   PxEffectsSchema,
@@ -7121,6 +7534,8 @@ if (typeof window !== "undefined") {
   PxGradientUnits,
   PxKeyframeSchema,
   PxKeyframeValueSchema,
+  PxLoopDirection,
+  PxLoopRepeatAt,
   PxLoopSchema,
   PxMaskedByEffectSchema,
   PxNodeBase,
@@ -7130,15 +7545,19 @@ if (typeof window !== "undefined") {
   PxRetimeEffectSchema,
   PxStrokeGradientEffectSchema,
   PxStrokeTrimEffectSchema,
+  PxStrokeTrimSubPaths,
   PxSvgNodeExtra,
   PxTextEffectSchema,
   PxTextPathEffectSchema,
+  PxTimelineEngine,
+  PxTimelineEngineExtra,
   PxTransformByEffectSchema,
   PxTransformPartsSchema,
   PxTransformValueSchema,
   PxTriggerSchema,
   STYLE_ATTR_NAMES,
   TRANSFORM_FN_NAMES,
+  applyAnimatorConfig,
   applyPlayerEffects,
   calcAnimationValues,
   camelCaseToKebabWordIfNeeded,
@@ -7153,6 +7572,7 @@ if (typeof window !== "undefined") {
   diffInEffect,
   evaluateMotionPathSegment,
   extendedPathForBrowser,
+  foldAnimatorConfigShortcuts,
   generateNewIds,
   getAnimatorConfig,
   getBindings,
@@ -7173,6 +7593,7 @@ if (typeof window !== "undefined") {
   materialiseInternalLoopsInTree,
   materialiseMotionPathInPropAnim,
   materialiseMotionPathsInTree,
+  mergeAnimatorConfig,
   normalizeDocument,
   propAnimIsMotionPath,
   px,
@@ -7181,6 +7602,7 @@ if (typeof window !== "undefined") {
   setupAnimationTriggers,
   shiftAnimatable,
   toRGBA,
+  validateDocument,
   validateNodeEffects,
   visualModelAt
 });