@pixodesk/svg-animator-web 1.0.34 → 1.0.39

package/dist/index.cjs

@@ -49,64 +49,105 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  COLOUR_ATTR_NAMES: () => COLOUR_ATTR_NAMES,
+  BASELINE_PLAYER_VERSION: () => BASELINE_PLAYER_VERSION,
+  COLOR_ATTR_NAMES: () => COLOR_ATTR_NAMES,
+  DEFAULT_DURATION_MS: () => DEFAULT_DURATION_MS,
   MISSING_GLYPH_CLASS_NAME: () => MISSING_GLYPH_CLASS_NAME,
-  PX_ANIMATOR_DATA_KEY: () => PX_ANIMATOR_DATA_KEY,
+  PLAYER_WIRE_STEPS: () => PLAYER_WIRE_STEPS,
+  PLAYER_WIRE_VERSION: () => PLAYER_WIRE_VERSION,
+  PX_ANIMATOR_DOC_KEY: () => PX_ANIMATOR_DOC_KEY,
   PX_ANIM_ATTR_NAME: () => PX_ANIM_ATTR_NAME,
   PX_ANIM_SRC_ATTR_NAME: () => PX_ANIM_SRC_ATTR_NAME,
+  PX_PLAYER_SCHEMA_VERSION: () => PX_PLAYER_SCHEMA_VERSION,
   PX_TRANSFORM_PART_KEYS: () => PX_TRANSFORM_PART_KEYS,
+  PX_TRIGGER_DEFAULTS: () => PX_TRIGGER_DEFAULTS,
+  PxAlongPathMode: () => PxAlongPathMode,
   PxAnimatedSvgDocumentSchema: () => PxAnimatedSvgDocumentSchema,
   PxAnimationDefinitionSchema: () => PxAnimationDefinitionSchema,
   PxAnimatorConfigSchema: () => PxAnimatorConfigSchema,
-  PxAnimatorEngine: () => PxAnimatorEngine,
-  PxAnimatorMode: () => PxAnimatorMode,
   PxAttrValueSchema: () => PxAttrValueSchema,
   PxBezierPathSchema: () => PxBezierPathSchema,
   PxBindingSchema: () => PxBindingSchema,
+  PxClipPathEffectSchema: () => PxClipPathEffectSchema,
   PxCloneEffectSchema: () => PxCloneEffectSchema,
+  PxCloneWithout: () => PxCloneWithout,
+  PxControlMode: () => PxControlMode,
   PxDefsSchema: () => PxDefsSchema,
+  PxDiagnosticKind: () => PxDiagnosticKind,
   PxEasingOrRefSchema: () => PxEasingOrRefSchema,
   PxEffectsSchema: () => PxEffectsSchema,
   PxElementAnimationSchema: () => PxElementAnimationSchema,
   PxFillGradientEffectSchema: () => PxFillGradientEffectSchema,
+  PxFinishAction: () => PxFinishAction,
   PxGradientSpreadMethod: () => PxGradientSpreadMethod,
   PxGradientStopSchema: () => PxGradientStopSchema,
   PxGradientType: () => PxGradientType,
-  PxGradientUnits: () => PxGradientUnits,
   PxKeyframeSchema: () => PxKeyframeSchema,
   PxKeyframeValueSchema: () => PxKeyframeValueSchema,
+  PxLengthAdjust: () => PxLengthAdjust,
+  PxLoopDirection: () => PxLoopDirection,
+  PxLoopRepeatAt: () => PxLoopRepeatAt,
   PxLoopSchema: () => PxLoopSchema,
+  PxMaskType: () => PxMaskType,
   PxMaskedByEffectSchema: () => PxMaskedByEffectSchema,
   PxNodeBase: () => PxNodeBase,
   PxNodeSchema: () => PxNodeSchema,
+  PxPathOverflow: () => PxPathOverflow,
+  PxPinAlign: () => PxPinAlign,
   PxPropertyAnimationSchema: () => PxPropertyAnimationSchema,
   PxRepeaterEffectSchema: () => PxRepeaterEffectSchema,
   PxRetimeEffectSchema: () => PxRetimeEffectSchema,
+  PxScrollAxis: () => PxScrollAxis,
+  PxScrollKind: () => PxScrollKind,
+  PxScrollPhase: () => PxScrollPhase,
+  PxScrollRangePointSchema: () => PxScrollRangePointSchema,
+  PxScrollRangeSchema: () => PxScrollRangeSchema,
+  PxScrollSchema: () => PxScrollSchema,
+  PxScrollSource: () => PxScrollSource,
   PxStrokeGradientEffectSchema: () => PxStrokeGradientEffectSchema,
   PxStrokeTrimEffectSchema: () => PxStrokeTrimEffectSchema,
+  PxStrokeTrimSubPaths: () => PxStrokeTrimSubPaths,
   PxSvgNodeExtra: () => PxSvgNodeExtra,
   PxTextEffectSchema: () => PxTextEffectSchema,
   PxTextPathEffectSchema: () => PxTextPathEffectSchema,
+  PxTextPathMethod: () => PxTextPathMethod,
+  PxTextPathSpacing: () => PxTextPathSpacing,
+  PxTimelineEngine: () => PxTimelineEngine,
+  PxTimelineEngineExtra: () => PxTimelineEngineExtra,
+  PxTimelinePinSchema: () => PxTimelinePinSchema,
+  PxTimelineSchema: () => PxTimelineSchema,
   PxTransformByEffectSchema: () => PxTransformByEffectSchema,
   PxTransformPartsSchema: () => PxTransformPartsSchema,
   PxTransformValueSchema: () => PxTransformValueSchema,
   PxTriggerSchema: () => PxTriggerSchema,
+  PxUnits: () => PxUnits,
   STYLE_ATTR_NAMES: () => STYLE_ATTR_NAMES,
   TRANSFORM_FN_NAMES: () => TRANSFORM_FN_NAMES,
+  WIRE_VERSION_KEY: () => WIRE_VERSION_KEY,
+  WireStepKind: () => WireStepKind,
+  WireVersionRelation: () => WireVersionRelation,
+  applyAnimatorConfig: () => applyAnimatorConfig,
   applyPlayerEffects: () => applyPlayerEffects,
   calcAnimationValues: () => calcAnimationValues,
   camelCaseToKebabWordIfNeeded: () => camelCaseToKebabWordIfNeeded,
   collectSampleTimes: () => collectSampleTimes,
+  compareWireVersion: () => compareWireVersion,
+  controlModeTakesOverTrigger: () => controlModeTakesOverTrigger,
+  convertPlayerDocument: () => convertPlayerDocument,
   createAnimator: () => createAnimator,
-  createAnimatorImpl: () => createAnimatorImpl,
   createBasicFrameLoopAnimator: () => createBasicFrameLoopAnimator,
+  createDiagnostics: () => createDiagnostics,
   createFrameLoopAnimator: () => createFrameLoopAnimator,
   createPathSampler: () => createPathSampler,
   createWebApiAnimator: () => createWebApiAnimator,
   describeSchema: () => describeSchema,
+  diagnoseDocument: () => diagnoseDocument,
   diffInEffect: () => diffInEffect,
+  downgradePlayerDocument: () => downgradePlayerDocument,
   evaluateMotionPathSegment: () => evaluateMotionPathSegment,
   extendedPathForBrowser: () => extendedPathForBrowser,
+  foldTimelineOverride: () => foldTimelineOverride,
+  formatWireVersion: () => formatWireVersion,
   generateNewIds: () => generateNewIds,
   getAnimatorConfig: () => getAnimatorConfig,
   getBindings: () => getBindings,
@@ -118,24 +159,33 @@ __export(index_exports, {
   jsonElementFactory: () => jsonElementFactory,
   layoutGlyphTextChars: () => layoutGlyphTextChars,
   loadTagAnimators: () => loadTagAnimators,
-  materialiseAllInTree: () => materialiseAllInTree,
-  materialiseAnimatedUseInstances: () => materialiseAnimatedUseInstances,
-  materialiseGlyphText: () => materialiseGlyphText,
-  materialiseGlyphTextAlongPath: () => materialiseGlyphTextAlongPath,
-  materialiseGlyphTextHorizontal: () => materialiseGlyphTextHorizontal,
-  materialiseInternalLoopsInPropAnim: () => materialiseInternalLoopsInPropAnim,
-  materialiseInternalLoopsInTree: () => materialiseInternalLoopsInTree,
-  materialiseMotionPathInPropAnim: () => materialiseMotionPathInPropAnim,
-  materialiseMotionPathsInTree: () => materialiseMotionPathsInTree,
-  normalizeDocument: () => getNormalisedBindings,
+  materializeAllInTree: () => materializeAllInTree,
+  materializeAnimatedUseInstances: () => materializeAnimatedUseInstances,
+  materializeGlyphText: () => materializeGlyphText,
+  materializeGlyphTextAlongPath: () => materializeGlyphTextAlongPath,
+  materializeGlyphTextHorizontal: () => materializeGlyphTextHorizontal,
+  materializeInternalLoopsInPropAnim: () => materializeInternalLoopsInPropAnim,
+  materializeInternalLoopsInTree: () => materializeInternalLoopsInTree,
+  materializeMotionPathInPropAnim: () => materializeMotionPathInPropAnim,
+  materializeMotionPathsInTree: () => materializeMotionPathsInTree,
+  mergeAnimatorConfig: () => mergeAnimatorConfig,
+  normalizeDocument: () => getNormalizedBindings,
+  parseWireVersion: () => parseWireVersion,
+  progressToTimeMs: () => progressToTimeMs,
   propAnimIsMotionPath: () => propAnimIsMotionPath,
   px: () => px,
+  readWireVersion: () => readWireVersion,
   renderNode: () => renderNode,
+  resolveControlMode: () => resolveControlMode,
+  resolveTrigger: () => resolveTrigger,
   schemaKeys: () => schemaKeys,
   setupAnimationTriggers: () => setupAnimationTriggers,
   shiftAnimatable: () => shiftAnimatable,
+  timeToProgress: () => timeToProgress,
   toRGBA: () => toRGBA,
+  validateDocument: () => validateDocument,
   validateNodeEffects: () => validateNodeEffects,
+  versionAdvice: () => versionAdvice,
   visualModelAt: () => visualModelAt
 });
 module.exports = __toCommonJS(index_exports);
@@ -174,7 +224,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 +235,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 +286,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 +297,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 +416,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]] : []];
@@ -402,13 +452,13 @@ function parseColor(s) {
   }
   return void 0;
 }
-var COLOUR_ATTR_NAMES = /* @__PURE__ */ new Set(["color", "fill", "flood-color", "lighting-color", "stop-color", "stroke"]);
+var COLOR_ATTR_NAMES = /* @__PURE__ */ new Set(["color", "fill", "flood-color", "lighting-color", "stop-color", "stroke"]);
 var TRANSFORM_FN_NAMES = /* @__PURE__ */ new Set(["translate", "rotate", "scale", "skew"]);
 var PCT_BASED_ATTR_NAMES = /* @__PURE__ */ new Set(["offset-distance", "offsetDistance"]);
 function composeTransformParts(parts, opts) {
-  var _a;
+  var _a2;
   if (!parts) return "";
-  const withUnits = (_a = opts == null ? void 0 : opts.withUnits) != null ? _a : true;
+  const withUnits = (_a2 = opts == null ? void 0 : opts.withUnits) != null ? _a2 : true;
   const segs = [];
   const t = parts.translate;
   const o = parts.origin;
@@ -426,7 +476,7 @@ function composeTransformParts(parts, opts) {
   return segs.join("");
 }
 function parseTransformParts(str2) {
-  var _a, _b;
+  var _a2, _b;
   if (!str2 || typeof str2 !== "string") return void 0;
   const out = {};
   const re = /([a-zA-Z]+)\s*\(([^)]*)\)/g;
@@ -442,7 +492,7 @@ function parseTransformParts(str2) {
     if (nums.some((n) => Number.isNaN(n))) return void 0;
     if (fn === "translate") {
       if (nums.length < 1 || nums.length > 2) return void 0;
-      out.translate = [nums[0], (_a = nums[1]) != null ? _a : 0];
+      out.translate = [nums[0], (_a2 = nums[1]) != null ? _a2 : 0];
     } else if (fn === "rotate") {
       if (nums.length !== 1) return void 0;
       out.rotate = nums[0];
@@ -646,8 +696,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);
 }
@@ -659,9 +709,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);
@@ -673,6 +723,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 = "";
@@ -780,6 +831,7 @@ var Enum = class extends Base {
     return false;
   }
 };
+var UNION_MEMBER_ERROR_LIMIT = 4;
 var Union = class extends Base {
   constructor(schemas, defaultVal) {
     super();
@@ -794,10 +846,38 @@ 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));
+    if (!ctx) return false;
+    const base = pathStr(path != null ? path : []);
+    ctx.errors.push(base + ": no union member matched for value " + ((_a2 = JSON.stringify(raw)) != null ? _a2 : "").slice(0, 240));
+    let best;
+    let bestDepth = -1;
+    const leafExpectations = [];
+    for (const member of this.schemas) {
+      const sink = { errors: [], warnings: [], strict: ctx.strict };
+      member.isValid(raw, sink, path ? [...path] : void 0);
+      if (!sink.errors.length) continue;
+      const depth = Math.max(...sink.errors.map((e) => e.slice(0, e.indexOf(":")).length));
+      if (depth > bestDepth || depth === bestDepth && best && sink.errors.length < best.length) {
+        bestDepth = depth;
+        best = sink.errors;
+      }
+      if (depth <= base.length) {
+        for (const e of sink.errors) {
+          const m = /: expected (.+?), got /.exec(e);
+          if (m && !leafExpectations.includes(m[1])) leafExpectations.push(m[1]);
+        }
+      }
+    }
+    if (best && bestDepth > base.length) {
+      for (const e of best.slice(0, UNION_MEMBER_ERROR_LIMIT)) {
+        if (!ctx.errors.includes(e)) ctx.errors.push(e);
+      }
+    } else if (leafExpectations.length) {
+      ctx.errors.push(base + ": expected " + leafExpectations.join(" | "));
+    }
     return false;
   }
   _canSanitize(raw) {
@@ -806,6 +886,7 @@ var Union = class extends Base {
 };
 var DiscriminatedUnion = class extends Base {
   constructor(_key, _schemas, defaultVal) {
+    var _a2;
     super();
     this._key = _key;
     this._schemas = _schemas;
@@ -814,18 +895,21 @@ var DiscriminatedUnion = class extends Base {
     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);
@@ -854,7 +938,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;
   }
@@ -876,7 +961,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;
       }
@@ -900,7 +985,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)) {
@@ -1041,8 +1127,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);
@@ -1093,7 +1179,7 @@ function schemaKeys(schema) {
   );
 }
 function describeSchema(schema) {
-  var _a;
+  var _a2;
   const s = schema;
   switch (s._kind) {
     case "union":
@@ -1108,7 +1194,7 @@ function describeSchema(schema) {
   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.resolved = s.fn() };
+  if ("fn" in s) return { kind: "lazy", resolved: (_a2 = s.resolved) != null ? _a2 : s.resolved = s.fn() };
   return { kind: "leaf" };
 }
 var px = {
@@ -1162,24 +1248,327 @@ 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 WIRE_VERSION_KEY = "version";
+var ANIMATOR_KEY = "animator";
+var META_KEY = "meta";
+var WireVersionRelation = /* @__PURE__ */ ((WireVersionRelation2) => {
+  WireVersionRelation2["unstamped"] = "unstamped";
+  WireVersionRelation2["same"] = "same";
+  WireVersionRelation2["older"] = "older";
+  WireVersionRelation2["newer"] = "newer";
+  WireVersionRelation2["otherGeneration"] = "otherGeneration";
+  return WireVersionRelation2;
+})(WireVersionRelation || {});
+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]) };
+}
+function formatWireVersion(v) {
+  return v.a + "." + v.b + "." + v.c;
+}
+var _a;
+var PLAYER_WIRE_VERSION = (_a = parseWireVersion(PX_PLAYER_SCHEMA_VERSION)) != null ? _a : { a: 1, b: 1, c: 0 };
+function getAnimatorBlock(doc) {
+  if (!doc || typeof doc !== "object") return void 0;
+  const atRoot = readObjectProp(doc, ANIMATOR_KEY);
+  if (atRoot) return atRoot;
+  const meta = readObjectProp(doc, META_KEY);
+  return meta ? readObjectProp(meta, ANIMATOR_KEY) : void 0;
+}
+function readObjectProp(obj, key) {
+  const value = obj[key];
+  return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function readWireVersion(doc) {
+  const animator = getAnimatorBlock(doc);
+  return animator ? parseWireVersion(animator[WIRE_VERSION_KEY]) : void 0;
+}
+function compareWireVersion(file, mine, readerReadsEditorPart) {
+  if (!file) return "unstamped";
+  if (file.a !== mine.a) return "otherGeneration";
+  if (file.b !== mine.b) return file.b > mine.b ? "newer" : "older";
+  if (!readerReadsEditorPart || file.c === mine.c) return "same";
+  return file.c > mine.c ? "newer" : "older";
+}
+function versionAdvice(relation, file, mine, isPlayer) {
+  if (!file) return void 0;
+  const target = isPlayer ? "player" : "editor";
+  const gap = "written for schema " + formatWireVersion(file) + ", this " + target + " reads " + formatWireVersion(mine);
+  switch (relation) {
+    case "newer":
+      return "This file is " + gap + ". Update the " + target + " to open it fully.";
+    case "older":
+      return "This file is " + gap + ". Saving it from this " + target + " rewrites it in the current format.";
+    case "otherGeneration":
+      return "This file is " + gap + " \u2014 a different format generation, which no conversion bridges. Open it in a " + target + " of that generation, or accept this document without the parts named above.";
+    default:
+      return void 0;
+  }
+}
+var WireStepKind = /* @__PURE__ */ ((WireStepKind2) => {
+  WireStepKind2["additive"] = "additive";
+  WireStepKind2["converted"] = "converted";
+  return WireStepKind2;
+})(WireStepKind || {});
+var BASELINE_PLAYER_VERSION = "1.1";
+var PLAYER_WIRE_STEPS = [];
+function applyWireSteps(doc, cfg) {
+  const from = readWireVersion(doc);
+  const relation = compareWireVersion(from, cfg.target, cfg.readerReadsEditorPart);
+  if (!from || relation !== "older") {
+    return {
+      doc,
+      from,
+      relation,
+      applied: [],
+      advice: versionAdvice(relation, from, cfg.target, !cfg.readerReadsEditorPart)
+    };
+  }
+  const due = [];
+  for (const step of cfg.steps) {
+    const stepTo = parseWireVersion(step.to);
+    if (!stepTo) continue;
+    if (compareWireVersion(from, stepTo, cfg.readerReadsEditorPart) !== "older") continue;
+    if (!step.up) continue;
+    due.push(step);
+  }
+  if (!due.length || !doc || typeof doc !== "object") return { doc, from, relation, applied: [] };
+  const target = clonePlain(doc);
+  const applied = [];
+  for (const step of due) {
+    try {
+      step.up(target);
+      applied.push(step);
+    } catch (e) {
+      break;
+    }
+  }
+  if (!applied.length) return { doc, from, relation, applied: [] };
+  stampVersion(target, cfg.target, cfg.readerReadsEditorPart);
+  return { doc: target, from, relation, applied };
+}
+function convertPlayerDocument(doc) {
+  return applyWireSteps(doc, {
+    steps: PLAYER_WIRE_STEPS,
+    target: PLAYER_WIRE_VERSION,
+    readerReadsEditorPart: false
+  });
+}
+function clonePlain(value) {
+  const structured = globalThis.structuredClone;
+  return structured ? structured(value) : JSON.parse(JSON.stringify(value));
+}
+function stampVersion(doc, target, readerReadsEditorPart) {
+  const animator = getAnimatorBlock(doc);
+  if (!animator) return;
+  const previous = parseWireVersion(animator[WIRE_VERSION_KEY]);
+  animator[WIRE_VERSION_KEY] = formatWireVersion({
+    a: target.a,
+    b: target.b,
+    c: readerReadsEditorPart ? target.c : previous ? previous.c : 0
+  });
+}
+function applyWireStepsDown(doc, cfg) {
+  const from = readWireVersion(doc);
+  if (!from) {
+    return { ok: false, blocking: [], reason: "The document carries no version, so there is nothing to convert down from." };
+  }
+  const relation = compareWireVersion(from, cfg.target, cfg.readerReadsEditorPart);
+  if (relation === "otherGeneration") {
+    return {
+      ok: false,
+      blocking: [],
+      reason: "Schema " + formatWireVersion(from) + " and " + formatWireVersion(cfg.target) + " are different generations; no conversion bridges them."
+    };
+  }
+  if (relation !== "newer") return { ok: true, doc, applied: [] };
+  const toUndo = [];
+  for (const step of cfg.steps) {
+    const stepTo = parseWireVersion(step.to);
+    if (!stepTo) continue;
+    if (compareWireVersion(stepTo, cfg.target, cfg.readerReadsEditorPart) !== "newer") continue;
+    if (compareWireVersion(stepTo, from, cfg.readerReadsEditorPart) === "newer") continue;
+    toUndo.push(step);
+  }
+  toUndo.reverse();
+  const blocking = toUndo.filter((s) => s.kind === "converted" && !s.down);
+  if (blocking.length) {
+    return {
+      ok: false,
+      blocking,
+      reason: "Cannot convert down to " + formatWireVersion(cfg.target) + ": " + blocking.map((s) => s.from + " \u2192 " + s.to + " (" + s.reason + ")").join("; ") + " cannot be undone."
+    };
+  }
+  const target = clonePlain(doc);
+  const applied = [];
+  for (const step of toUndo) {
+    if (!step.down) continue;
+    try {
+      step.down(target);
+      applied.push(step);
+    } catch (e) {
+      return {
+        ok: false,
+        blocking: [step],
+        reason: "Undoing " + step.from + " \u2192 " + step.to + " failed: " + String(e)
+      };
+    }
+  }
+  stampVersion(target, cfg.target, cfg.readerReadsEditorPart);
+  return { ok: true, doc: target, applied };
+}
+function downgradePlayerDocument(doc, target) {
+  return applyWireStepsDown(doc, { steps: PLAYER_WIRE_STEPS, target, readerReadsEditorPart: false });
+}
+var PxFillMode = {
+  forwards: "forwards",
+  backwards: "backwards",
+  both: "both",
+  none: "none"
+};
+var PxPlaybackDirection = {
+  normal: "normal",
+  reverse: "reverse",
+  alternate: "alternate",
+  alternateReverse: "alternate-reverse"
+};
 var PX_ANIM_SRC_ATTR_NAME = "data-px-animation-src";
 var PX_ANIM_ATTR_NAME = "_px_animator";
-var PxAnimatorMode = {
-  auto: "auto",
-  waapi: "waapi",
-  frames: "frames"
+var PxStartOn = {
+  load: "load",
+  mouseOver: "mouseOver",
+  click: "click",
+  scrollIntoView: "scrollIntoView",
+  programmatic: "programmatic"
+};
+var PxOutAction = {
+  continue: "continue",
+  pause: "pause",
+  reset: "reset",
+  reverse: "reverse"
+};
+var PxFinishAction = {
+  hold: "hold",
+  reset: "reset"
+};
+var PxScrollKind = {
+  view: "view",
+  scroll: "scroll"
+};
+var PxScrollAxis = {
+  block: "block",
+  inline: "inline",
+  x: "x",
+  y: "y"
 };
-var PxAnimatorEngine = {
-  waapi: PxAnimatorMode.waapi,
-  frames: PxAnimatorMode.frames
+var PxScrollSource = {
+  nearest: "nearest",
+  root: "root"
+};
+var PxPinAlign = {
+  top: "top",
+  center: "center",
+  bottom: "bottom"
+};
+var PxScrollPhase = {
+  cover: "cover",
+  contain: "contain",
+  entry: "entry",
+  exit: "exit",
+  entryCrossing: "entry-crossing",
+  exitCrossing: "exit-crossing"
+};
+var PxAlongPathMode = {
+  sampled: "sampled",
+  offsetPath: "offsetPath"
+};
+var PX_TIMELINE_SHARED_KEYS = ["duration", "iterations", "engine", "frameRate"];
+var PX_TIME_ONLY_TIMELINE_KEYS = ["trigger", "delay", "fillMode", "direction"];
+var PX_FLAT_RUNTIME_VIEW_KEYS = [
+  ...PX_TIMELINE_SHARED_KEYS,
+  ...PX_TIME_ONLY_TIMELINE_KEYS,
+  "fill",
+  "resetOnFinish",
+  "timelineSource",
+  "scroll"
+];
+var PxTimelineEngine = {
+  native: "native",
+  js: "js"
+};
+var PxTimelineEngineExtra = __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 PX_TRIGGER_DEFAULTS = {
+  startOn: "load",
+  outAction: "continue",
+  scrollIntoViewThreshold: 0
+};
+var PxControlMode = {
+  /** No control props — the document's trigger decides, and nothing is taken over. */
+  static: "static",
+  /** `progress` / `time` — the host scrubs; the component seeks and stays paused. */
+  fixedTime: "fixedTime",
+  /** `play` / `pause` — the host drives playback with booleans. */
+  play: "play",
+  /** `autoplay` — the document's own trigger starts it. */
+  autoplay: "autoplay"
+};
+function resolveControlMode(props) {
+  const hasFixedTime = props.progress !== void 0 || props.time !== void 0;
+  const hasPlayPause = props.play !== void 0 || props.pause !== void 0;
+  const hasAutoplay = !!props.autoplay;
+  const warnings = [];
+  const named = (a, b, winner) => a + " and " + b + " were both set \u2014 " + winner + " wins, " + (winner === a ? b : a) + " is ignored.";
+  if (hasFixedTime) {
+    if (hasPlayPause) warnings.push(named("progress/time", "play/pause", "progress/time"));
+    if (hasAutoplay) warnings.push(named("progress/time", "autoplay", "progress/time"));
+    return { mode: PxControlMode.fixedTime, warnings };
+  }
+  if (hasPlayPause) {
+    if (hasAutoplay) warnings.push(named("play/pause", "autoplay", "play/pause"));
+    return { mode: PxControlMode.play, warnings };
+  }
+  if (hasAutoplay) return { mode: PxControlMode.autoplay, warnings };
+  return { mode: PxControlMode.static, warnings };
+}
+function controlModeTakesOverTrigger(mode) {
+  return mode !== PxControlMode.autoplay;
+}
+function resolveTrigger(trigger) {
+  var _a2, _b, _c;
+  return {
+    startOn: (_a2 = trigger == null ? void 0 : trigger.startOn) != null ? _a2 : PX_TRIGGER_DEFAULTS.startOn,
+    outAction: (_b = trigger == null ? void 0 : trigger.outAction) != null ? _b : PX_TRIGGER_DEFAULTS.outAction,
+    scrollIntoViewThreshold: (_c = trigger == null ? void 0 : trigger.scrollIntoViewThreshold) != null ? _c : PX_TRIGGER_DEFAULTS.scrollIntoViewThreshold
+  };
+}
+var PxLoopRepeatAt = {
+  /** Segment from the START; the repetition runs BEFORE the first keyframe
+   *  (intro loops that play until the main timeline begins). */
+  start: "start",
+  /** DEFAULT — segment from the END; the repetition runs AFTER the last keyframe
+   *  (idle/outro loops that continue once the main timeline has finished). */
+  end: "end"
 };
-var 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",
@@ -1189,8 +1578,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",
@@ -1212,8 +1602,10 @@ var PxStrokeTrimSubPaths = {
   separate: "separate",
   combined: "combined"
 };
-var TEXT_ATTR = "text";
 var TEXT_CONTENT_ATTR = "textContent";
+var CLASS_ATTR = "class";
+var TRANSFORM_ATTR = "transform";
+var OFFSET_DISTANCE_ATTR = "offsetDistance";
 var INTERNAL_ATTRS = /* @__PURE__ */ new Set([
   "type",
   "children",
@@ -1221,14 +1613,20 @@ var INTERNAL_ATTRS = /* @__PURE__ */ new Set([
   "meta",
   "animate",
   "effects",
-  TEXT_ATTR,
   TEXT_CONTENT_ATTR
 ]);
-var PX_TRANSFORM_PART_KEYS = ["translate", "rotate", "scale", "origin"];
-var PxGradientUnits = {
-  userSpaceOnUse: "userSpaceOnUse",
-  objectBoundingBox: "objectBoundingBox"
+var TRANSFORM_PART = {
+  translate: "translate",
+  rotate: "rotate",
+  scale: "scale",
+  origin: "origin"
 };
+var PX_TRANSFORM_PART_KEYS = [
+  TRANSFORM_PART.translate,
+  TRANSFORM_PART.rotate,
+  TRANSFORM_PART.scale,
+  TRANSFORM_PART.origin
+];
 var PxGradientSpreadMethod = {
   pad: "pad",
   reflect: "reflect",
@@ -1242,27 +1640,38 @@ 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;
-  const cfg = (doc == null ? void 0 : doc.animator) || ((_a = doc == null ? void 0 : doc.meta) == null ? void 0 : _a.animator);
-  return cfg ? flattenAnimatorTimeline(cfg) : void 0;
-}
+  var _a2;
+  const cfg = (doc == null ? void 0 : doc.animator) || ((_a2 = doc == null ? void 0 : doc.meta) == null ? void 0 : _a2.animator);
+  if (!cfg) return void 0;
+  const memoised = wireViewMemo.get(cfg);
+  if (memoised) return memoised;
+  const wire = cfg;
+  const stray = PX_FLAT_RUNTIME_VIEW_KEYS.filter((k) => wire[k] !== void 0);
+  const source = stray.length ? __spreadValues2({}, wire) : cfg;
+  for (const k of stray) delete source[k];
+  const view = flattenAnimatorTimeline(source);
+  wireViewMemo.set(cfg, view);
+  return view;
+}
+var wireViewMemo = /* @__PURE__ */ new WeakMap();
 var flattenMemo = /* @__PURE__ */ new WeakMap();
 function flattenAnimatorTimeline(cfg) {
   const timeline = cfg.timeline;
   if (timeline === void 0 || timeline === null || typeof timeline !== "object") return cfg;
   const memoised = flattenMemo.get(cfg);
   if (memoised) return memoised;
-  const _a = cfg, { timeline: _dropped } = _a, flat = __objRest2(_a, ["timeline"]);
+  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.engine !== void 0) scroll.driver = timeline.engine;
     if (timeline.axis !== void 0) scroll.axis = timeline.axis;
     if (timeline.source !== void 0) scroll.source = timeline.source;
     if (timeline.subject !== void 0) scroll.subject = timeline.subject;
@@ -1273,34 +1682,34 @@ function flattenAnimatorTimeline(cfg) {
     else if (pin && typeof pin === "object") {
       scroll.pin = true;
       if (pin.align !== void 0) scroll.pinAlign = pin.align;
-      if (pin.top !== void 0) scroll.pinTop = pin.top;
+      if (pin.offset !== void 0) scroll.pinOffset = pin.offset;
       if (pin.distance !== void 0) scroll.pinDistance = pin.distance;
     }
     flat.scroll = scroll;
   } else {
     if (timeline.duration !== void 0) flat.duration = timeline.duration;
     if (timeline.trigger !== void 0) {
-      const _b = timeline.trigger, { onFinish } = _b, restTrigger = __objRest2(_b, ["onFinish"]);
+      const _b = timeline.trigger, { finishAction } = _b, restTrigger = __objRest2(_b, ["finishAction"]);
       if (Object.keys(restTrigger).length) flat.trigger = restTrigger;
-      if (onFinish !== void 0) flat.resetOnFinish = onFinish === "reset";
+      if (finishAction !== void 0) flat.resetOnFinish = finishAction === "reset";
     }
     if (timeline.delay !== void 0) flat.delay = timeline.delay;
     if (timeline.iterations !== void 0) flat.iterations = timeline.iterations;
     if (timeline.direction !== void 0) flat.direction = timeline.direction;
-    if (timeline.fill !== void 0) flat.fill = timeline.fill;
+    if (timeline.fillMode !== void 0) flat.fill = timeline.fillMode;
   }
   flattenMemo.set(cfg, flat);
   return flat;
 }
 function getDefs(doc) {
-  var _a;
+  var _a2;
   if (!doc) return void 0;
-  return (_a = getAnimatorConfig(doc)) == null ? void 0 : _a.definitions;
+  return (_a2 = getAnimatorConfig(doc)) == null ? void 0 : _a2.definitions;
 }
 function getBindings(doc) {
-  var _a;
+  var _a2;
   if (!doc) return void 0;
-  const animateById = (_a = getAnimatorConfig(doc)) == null ? void 0 : _a.animateById;
+  const animateById = (_a2 = getAnimatorConfig(doc)) == null ? void 0 : _a2.animateById;
   if (!animateById) return void 0;
   return Object.entries(animateById).map(([id, anim]) => ({ id: id.startsWith("#") ? id.slice(1) : id, animate: anim }));
 }
@@ -1316,14 +1725,13 @@ var PxKeyframeValueSchema = implementsInterface()(px.union([
   // e.g. for colors
   px.number(),
   px.array(px.number()),
-  // ORDER LAW: the key-discriminated object shapes (`{path}`, `{paths}`) come BEFORE the
+  // ORDER LAW: the key-discriminated object shape (`{pathData}`) comes BEFORE the
   // all-optional transform-parts record. In default (non-strict) mode that record accepts
   // ANY object (every key optional, unknown keys ignored), so listing it earlier made
-  // Union.sanitize route `{path}`/`{paths}` values into it and strip them to `{}` —
+  // Union.sanitize route `{pathData}` values into it and strip them to `{}` —
   // silent morph-data loss (repro: the editor's keyframeValueSanitize spec). Validity is
   // order-independent (`some()`); only sanitize routing depends on this order.
-  px.object({ path: px.string() }),
-  px.lazy(() => px.object({ paths: px.array(PxBezierPathSchema) }), { paths: [] }),
+  px.object({ pathData: px.string() }),
   // Gradient `stops` timeline — each kf value is the full stops-array snapshot.
   px.lazy(() => px.array(PxGradientStopSchema), []),
   px.lazy(() => PxTransformPartsSchema, {})
@@ -1338,16 +1746,32 @@ var PxKeyframeSchema = implementsInterface()(px.object({
   // (review §1.3): editor data lives under `meta`. The editor still carries it on
   // its internal COPY-PASTE payload, which never validates against this schema.)
 }));
+var anyKf = (kf) => kf;
+var kfTime = (kf) => {
+  var _a2, _b;
+  return (_b = (_a2 = anyKf(kf).time) != null ? _a2 : anyKf(kf).t) != null ? _b : 0;
+};
+var kfValue = (kf) => {
+  var _a2;
+  return (_a2 = anyKf(kf).value) != null ? _a2 : anyKf(kf).v;
+};
+var kfEasing = (kf) => {
+  var _a2;
+  return (_a2 = anyKf(kf).easing) != null ? _a2 : anyKf(kf).e;
+};
+var kfTangentIn = (kf) => anyKf(kf).tangentIn;
+var kfTangentOut = (kf) => anyKf(kf).tangentOut;
 var PxLoopSchema = implementsInterface()(px.object({
   segmentCount: px.number().optional(),
-  extend: px.enum([PxLoopExtend.before, PxLoopExtend.after]).optional(),
-  alternate: px.boolean().optional()
+  repeatAt: px.enum([PxLoopRepeatAt.start, PxLoopRepeatAt.end]).optional(),
+  direction: px.enum([PxLoopDirection.normal, PxLoopDirection.alternate]).optional()
 }));
 var PxPropertyAnimationSchema = implementsInterface()(px.object({
   value: PxKeyframeValueSchema.optional(),
   keyframes: px.array(PxKeyframeSchema).optional(),
   loop: px.union([PxLoopSchema, px.boolean()]).optional(),
-  autoOrient: px.boolean().optional()
+  autoOrient: px.boolean().optional(),
+  alongPathMode: px.enum([PxAlongPathMode.sampled, PxAlongPathMode.offsetPath]).optional()
 }));
 var PxTransformPartsSchema = implementsInterface()(px.object({
   translate: px.tuple([px.number(), px.number()]).optional(),
@@ -1371,18 +1795,17 @@ var PxElementAnimationSchema = implementsInterface()(px.union([
   PxAnimationDefinitionSchema
 ]));
 var PxTriggerSchema = implementsInterface()(px.object({
-  startOn: px.enum(["load", "mouseOver", "click", "scrollIntoView", "programmatic"]).optional(),
-  outAction: px.enum(["continue", "pause", "reset", "reverse"]).optional(),
+  startOn: px.enum([PxStartOn.load, PxStartOn.mouseOver, PxStartOn.click, PxStartOn.scrollIntoView, PxStartOn.programmatic], PX_TRIGGER_DEFAULTS.startOn).optional(),
+  outAction: px.enum([PxOutAction.continue, PxOutAction.pause, PxOutAction.reset, PxOutAction.reverse], PX_TRIGGER_DEFAULTS.outAction).optional(),
   // What happens after a NATURAL finish — `'hold'` (default: keep the end state per
-  // `fill`) or `'reset'` (snap back to the start state). The trigger-vocabulary home of
-  // the old top-level `resetOnFinish: boolean` (read-legacy) — review §2.3: both
-  // "what happens at the end" knobs now sit side by side and share one style of value.
-  onFinish: px.enum(["hold", "reset"]).optional(),
+  // `fill`) or `'reset'` (snap back to the start state). Pairs with `outAction` ("what
+  // happens when the trigger condition ends"); both end-of-life knobs now read alike.
+  finishAction: px.enum([PxFinishAction.hold, PxFinishAction.reset]).optional(),
   scrollIntoViewThreshold: px.number().optional()
 }));
 var PxGlyphSchema = implementsInterface()(px.object({
   width: px.number(),
-  d: px.string()
+  pathData: px.string()
 }));
 var PxGlyphFontSchema = implementsInterface()(px.object({
   fontFamily: px.string(),
@@ -1397,11 +1820,17 @@ var PxDefsSchema = implementsInterface()(px.object({
   // Review §2.6: the schema now matches the declared type — a style preset is a flat
   // record of string|number attribute values, nothing nested.
   styles: px.record(px.record(px.union([px.string(), px.number()]))).optional(),
-  glyphs: px.record(PxGlyphFontSchema).optional()
+  fonts: px.record(PxGlyphFontSchema).optional()
 }));
-var PX_SCROLL_PHASES = ["cover", "contain", "entry", "exit", "entry-crossing", "exit-crossing"];
 var PxScrollRangePointSchema = implementsInterface()(px.object({
-  phase: px.enum(PX_SCROLL_PHASES).optional(),
+  phase: px.enum([
+    PxScrollPhase.cover,
+    PxScrollPhase.contain,
+    PxScrollPhase.entry,
+    PxScrollPhase.exit,
+    PxScrollPhase.entryCrossing,
+    PxScrollPhase.exitCrossing
+  ]).optional(),
   fraction: px.number().optional()
 }));
 var PxScrollRangeSchema = px.object({
@@ -1409,34 +1838,38 @@ 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(),
+  kind: px.enum([PxScrollKind.view, PxScrollKind.scroll]).optional(),
+  axis: px.enum([PxScrollAxis.block, PxScrollAxis.inline, PxScrollAxis.x, PxScrollAxis.y]).optional(),
+  source: px.enum([PxScrollSource.nearest, PxScrollSource.root]).optional(),
   // Free-form: the two keywords `parent`/`scroller` plus any CSS selector.
   subject: px.string().optional(),
   smoothing: px.number().optional(),
   pin: px.boolean().optional(),
-  pinAlign: px.enum(["top", "center", "bottom"]).optional(),
-  pinTop: px.number().optional(),
+  pinAlign: px.enum([PxPinAlign.top, PxPinAlign.center, PxPinAlign.bottom]).optional(),
+  pinOffset: px.number().optional(),
   pinDistance: px.number().optional(),
   range: PxScrollRangeSchema.optional()
 }));
-var PxTimelinePinSchema = px.object({
-  align: px.enum(["top", "center", "bottom"]).optional(),
-  top: px.number().optional(),
+var PxTimelinePinSchema = implementsInterface()(px.object({
+  align: px.enum([PxPinAlign.top, PxPinAlign.center, PxPinAlign.bottom]).optional(),
+  offset: px.number().optional(),
   distance: px.number().optional()
-});
-var PxClockTimelineSchema = px.object({
-  type: px.literal("clock"),
+}));
+var PxTimelineEngineSchema = px.enum([PxTimelineEngineExtra.auto, PxTimelineEngineExtra.native, PxTimelineEngineExtra.js]).optional();
+var PxTimeTimelineSchema = implementsInterface()(px.object({
+  type: px.literal("time").optional(),
+  engine: PxTimelineEngineSchema,
+  frameRate: px.number().optional(),
   // §2.8: duration is a property of the TIMELINE — how long one pass takes.
   duration: px.number().optional(),
   trigger: PxTriggerSchema.optional(),
   delay: px.number().optional(),
   iterations: px.union([px.number(), px.literal("infinite")]).optional(),
-  fill: px.enum(["forwards", "backwards", "both", "none"]).optional(),
-  direction: px.enum(["normal", "reverse", "alternate", "alternate-reverse"]).optional()
-});
+  // `fillMode` on the wire (CSS `animation-fill-mode`; the runtime view calls it `fill`)
+  // — never `fill`, which is paint everywhere else in the format.
+  fillMode: px.enum([PxFillMode.forwards, PxFillMode.backwards, PxFillMode.both, PxFillMode.none]).optional(),
+  direction: px.enum([PxPlaybackDirection.normal, PxPlaybackDirection.reverse, PxPlaybackDirection.alternate, PxPlaybackDirection.alternateReverse]).optional()
+}));
 var scrollishTimelineShape = {
   // §2.8: duration is a property of the TIMELINE — under scrubbing it is the keyframe
   // span the scroll range maps onto.
@@ -1444,9 +1877,10 @@ var scrollishTimelineShape = {
   // Finite repeat count IS meaningful when scrubbing — the scroll range maps onto
   // duration × iterations (rule D4; `'infinite'` cannot map to a range, so no literal here).
   iterations: px.number().optional(),
-  engine: px.enum(["custom", "native"]).optional(),
-  axis: px.enum(["block", "inline", "x", "y"]).optional(),
-  source: px.enum(["nearest", "root"]).optional(),
+  engine: PxTimelineEngineSchema,
+  frameRate: px.number().optional(),
+  axis: px.enum([PxScrollAxis.block, PxScrollAxis.inline, PxScrollAxis.x, PxScrollAxis.y]).optional(),
+  source: px.enum([PxScrollSource.nearest, PxScrollSource.root]).optional(),
   subject: px.string().optional(),
   // 'parent' | 'scroller' | any CSS selector
   smoothing: px.number().optional(),
@@ -1454,23 +1888,29 @@ var scrollishTimelineShape = {
   pin: px.union([px.boolean(), PxTimelinePinSchema]).optional(),
   range: PxScrollRangeSchema.optional()
 };
-var PxScrollTimelineSchema = px.object(__spreadValues2({ type: px.literal("scroll") }, scrollishTimelineShape));
-var PxViewTimelineSchema = px.object(__spreadValues2({ type: px.literal("view") }, scrollishTimelineShape));
+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", [
-  PxClockTimelineSchema,
+  PxTimeTimelineSchema,
+  // first = the member an absent `type` selects
   PxScrollTimelineSchema,
   PxViewTimelineSchema
 ]);
 var PxAnimatorConfigSchema = implementsInterface()(px.object({
-  mode: px.enum([PxAnimatorMode.auto, PxAnimatorMode.waapi, PxAnimatorMode.frames]).optional(),
-  // (`duration` lives INSIDE `timeline` on the wire — §2.8; the flat field below
-  // exists only on the runtime view, like the rest of the playback dynamics.)
-  frameRate: px.number().optional(),
+  // (`mode`, `duration` and `frameRate` live INSIDE `timeline` on the wire — §2.8; they exist
+  // at this level only on the runtime view, like the rest of the playback dynamics.)
   // THE spelling of "what advances progress" — clock / scroll / view (review §2.1).
   timeline: PxTimelineSchema.optional(),
   definitions: PxDefsSchema.optional(),
   animateById: px.record(PxElementAnimationSchema).optional(),
-  debugInstName: px.string().optional()
+  debugGlobalName: px.string().optional(),
+  // Declared HERE because this is a closed object: an undeclared key would be stripped by
+  // `sanitize` and flagged by strict validation on our own files.
+  version: px.string().optional()
 }));
 var PxBindingSchema = implementsInterface()(px.object({
   id: px.string(),
@@ -1519,7 +1959,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(),
@@ -1529,7 +1969,7 @@ var PxMaskedByEffectSchema = implementsInterface()(px.object({
   height: px.number().optional()
 }));
 var PxClipPathEffectSchema = implementsInterface()(px.object({
-  d: PxAnimatableStringSchema.optional()
+  pathData: PxAnimatableStringSchema.optional()
 }));
 var PxStrokeTrimEffectSchema = implementsInterface()(px.object({
   offset: PxAnimatableNumberSchema.optional(),
@@ -1542,9 +1982,10 @@ var PxRetimeEffectSchema = implementsInterface()(px.object({
   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({
@@ -1565,13 +2006,13 @@ var PxFillGradientEffectSchema = implementsInterface()(px.object({
   radius: PxAnimatableNumberSchema.optional(),
   focal: PxAnimatableVec2Schema.optional(),
   stops: PxAnimatableGradientStopsSchema.optional(),
-  gradientUnits: px.enum([PxGradientUnits.userSpaceOnUse, PxGradientUnits.objectBoundingBox]).optional(),
+  gradientUnits: px.enum([PxUnits.userSpaceOnUse, PxUnits.objectBoundingBox]).optional(),
   spreadMethod: px.enum([PxGradientSpreadMethod.pad, PxGradientSpreadMethod.reflect, PxGradientSpreadMethod.repeat]).optional(),
   gradientTransform: px.string().optional()
 }));
 var PxStrokeGradientEffectSchema = PxFillGradientEffectSchema;
 var PxTextPathEffectSchema = implementsInterface()(px.object({
-  path: px.string(),
+  pathData: px.string(),
   pathOverflow: px.enum([PxPathOverflow.clip, PxPathOverflow.extend]).optional(),
   lengthAdjust: px.enum([PxLengthAdjust.spacing, PxLengthAdjust.spacingAndGlyphs]).optional(),
   method: px.enum([PxTextPathMethod.align, PxTextPathMethod.stretch]).optional(),
@@ -1611,20 +2052,100 @@ function validateNodeEffects(root, opts) {
   walk(root, "root");
   return warnings;
 }
+function validateGlyphFontRefs(root, fonts) {
+  if (!fonts || !Object.keys(fonts).length) return [];
+  const problems = [];
+  const walk = (node, path, inherited, inGlyphText) => {
+    var _a2, _b;
+    if (!node) return;
+    const own = typeof node.fontFamily === "string" ? node.fontFamily : void 0;
+    const family = own != null ? own : inherited;
+    const isGlyphText = inGlyphText || node.type === "text" && !!((_b = (_a2 = node.effects) == null ? void 0 : _a2.text) == null ? void 0 : _b.useGlyphs);
+    if (isGlyphText && own && !Object.prototype.hasOwnProperty.call(fonts, own)) {
+      const problem = path + ': glyph-mode text uses font-family "' + own + '", which has no entry in animator.definitions.fonts';
+      if (!problems.includes(problem)) problems.push(problem);
+    }
+    if (Array.isArray(node.children)) {
+      node.children.forEach((c, i) => walk(c, path + ".children[" + i + "]", family, isGlyphText));
+    }
+  };
+  walk(root, "root", void 0, false);
+  return problems;
+}
+function validateEasingRefs(root, easings) {
+  const problems = [];
+  const walk = (node, path) => {
+    if (Array.isArray(node)) {
+      node.forEach((item, i) => walk(item, path + "[" + i + "]"));
+      return;
+    }
+    if (!node || typeof node !== "object") return;
+    const easing = node.easing;
+    if (typeof easing === "string" && !(easings && Object.prototype.hasOwnProperty.call(easings, easing))) {
+      const problem = path + '.easing: "' + easing + '" names no entry in animator.definitions.easings \u2014 it will play linear';
+      if (!problems.includes(problem)) problems.push(problem);
+    }
+    for (const [key, value] of Object.entries(node)) {
+      if (key === "easing") continue;
+      if (value && typeof value === "object") walk(value, path + "." + key);
+    }
+  };
+  walk(root, "root");
+  return problems;
+}
+function validateVersionStamp(doc) {
+  var _a2;
+  const version = (_a2 = getAnimatorConfig(doc)) == null ? void 0 : _a2.version;
+  if (version === void 0) return [];
+  if (parseWireVersion(version) !== void 0) return [];
+  return ["root.animator.version: " + JSON.stringify(version) + ' is not a version stamp ("a.b" or "a.b.c") \u2014 it reads as unstamped'];
+}
+function validateDocument(doc, opts) {
+  var _a2;
+  const strict = (opts == null ? void 0 : opts.strict) !== false;
+  const ctx = { errors: [], warnings: [], strict };
+  const problems = PxAnimatedSvgDocumentSchema.isValid(doc, ctx, ["root"]) ? [] : [...ctx.errors];
+  if (doc && typeof doc === "object") {
+    for (const w of validateNodeEffects(doc, { strict })) {
+      if (!problems.includes(w)) problems.push(w);
+    }
+    const defs = (_a2 = getAnimatorConfig(doc)) == null ? void 0 : _a2.definitions;
+    for (const w of validateGlyphFontRefs(doc, defs == null ? void 0 : defs.fonts)) {
+      if (!problems.includes(w)) problems.push(w);
+    }
+    for (const w of validateEasingRefs(doc, defs == null ? void 0 : defs.easings)) {
+      if (!problems.includes(w)) problems.push(w);
+    }
+    for (const w of validateVersionStamp(doc)) {
+      if (!problems.includes(w)) problems.push(w);
+    }
+  }
+  return problems;
+}
 var PxNodeBase = px.openObject({
   // CONVENTION (SCHEMA-DESIGN R1 / issues N4): `type` is the ONE word for "what
   // kind of thing is this", discriminated by its CARRIER — here the node TAG
-  // (`rect`, `text`), and inside a sub-object that object's kind (`clone.type`,
+  // (`rect`, `text`), and inside a sub-object that object's kind (`fillGradient.type`,
   // `fillGradient.type`, editor `preset.type`). Each sits in its own object, so
   // the carrier disambiguates completely; synonyms (`cloneKind`, `presetShape`)
   // would add words that all mean "type" and still need the carrier to read.
   // Guarding a `type` SLOT against a wrong VALUE is the job of strict enums
   // (issues V3), never of distinct key names.
   type: px.string(),
+  // The escape hatch for elements that carry a REAL `type` attribute — `<feTurbulence
+  // type="fractalNoise">`, `<feFuncR type="table">`, `<feColorMatrix type="saturate">`.
+  // `type` is taken by the tag name, so the attribute travels here and the renderer puts
+  // it back (`PxAnimatorDOM.renderNode`, `PxRnRender`). Declared here — not merely
+  // documented — because a wire key that is not in a schema is invisible to the
+  // minifier's reserve list and gets renamed (MINIFICATION-BOUNDARY-PLAN.md §1.1).
+  domType: px.string().optional(),
+  // Text content of a `<text>` / `<tspan>`. Declared, so a non-string value is a schema error
+  // and the minifier reserves the key; `text` is NOT an alias for it and is not read anywhere.
+  textContent: px.string().optional(),
   id: px.string().optional(),
   meta: px.any().optional(),
   // Player-effects bucket emitted by the Editor's lightweight design format.
-  // Consumed and removed by `applyPlayerEffects` before any other normalisation
+  // Consumed and removed by `applyPlayerEffects` before any other normalization
   // (see `createAnimatorImpl`), so downstream code never sees it.
   effects: PxEffectsSchema.optional(),
   // `PxElementAnimation` (not just `PxAnimationDefinition`) — accepts
@@ -1656,8 +2177,8 @@ var PxBezierPathSchema = implementsInterface()(px.object({
   c: px.boolean().optional()
 }));
 function isPxElementFileFormatDeep(fileJson) {
-  const valid = PxAnimatedSvgDocumentSchema.isValid(fileJson);
-  return { valid, errors: valid ? [] : ["Document failed schema validation"] };
+  const errors = validateDocument(fileJson, { strict: false });
+  return { valid: errors.length === 0, errors };
 }
 var _idCounter = 0;
 function generateUniqueId() {
@@ -1677,7 +2198,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"]);
@@ -1695,7 +2216,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") {
@@ -1712,7 +2234,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") {
@@ -1732,7 +2254,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) {
@@ -1748,13 +2270,13 @@ 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 [key, anim] of Object.entries(docAnimate)) {
@@ -1811,7 +2333,7 @@ function isDangerousAttrName(nameLower) {
   if (nameLower.startsWith("on")) return true;
   return false;
 }
-function sanitiseAttributeValue(name, value) {
+function sanitizeAttributeValue(name, value) {
   const nameLower = name.toLowerCase();
   if (isDangerousAttrName(nameLower)) {
     console.warn("Attribute blocked (event handler / dangerous): ", nameLower);
@@ -1836,10 +2358,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;
 }
@@ -1850,18 +2372,18 @@ function getNormalizedProps(props) {
     if (INTERNAL_ATTRS.has(key)) continue;
     if (key === "style") continue;
     let value = props[rawKey];
-    if (COLOUR_ATTR_NAMES.has(key) && Array.isArray(value)) {
+    if (COLOR_ATTR_NAMES.has(key) && Array.isArray(value)) {
       propsCopy[key] = toRGBA(value);
     } else if (key === "transform" && value !== null && typeof value === "object" && !Array.isArray(value) && !value.keyframes) {
       const parts = value.value && typeof value.value === "object" ? value.value : value;
-      propsCopy["transform"] = composeTransformParts(parts, { withUnits: false });
+      propsCopy[TRANSFORM_ATTR] = composeTransformParts(parts, { withUnits: false });
     } else if (TRANSFORM_FN_NAMES.has(key)) {
       if (Array.isArray(value)) {
         if (key === "translate") value = value.map((v) => v + "px");
         value = value.join(",");
       }
       if (key === "rotate") value = value + "deg";
-      propsCopy["transform"] = key + "(" + value + ")";
+      propsCopy[TRANSFORM_ATTR] = key + "(" + value + ")";
     } else if (Array.isArray(value)) {
       propsCopy[key] = value.join(",");
     } else if (value !== void 0 && value !== null) {
@@ -1871,8 +2393,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]];
@@ -1882,31 +2403,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;
   const kfs = anim.keyframes;
   if (!Array.isArray(kfs)) return false;
   if (anim.autoOrient) return true;
   for (const kf of kfs) {
-    if (((_a = kf.tangentIn) != null ? _a : kf.ti) || ((_b = kf.tangentOut) != null ? _b : kf.to)) return true;
+    if (kfTangentIn(kf) || kfTangentOut(kf)) return true;
   }
   return false;
 }
 var _segmentCache = /* @__PURE__ */ new WeakMap();
 function getSegmentCache(prevKf, nextKf, prevPos, nextPos) {
-  var _a, _b;
   let byNext = _segmentCache.get(prevKf);
   const existing = byNext == null ? void 0 : byNext.get(nextKf);
   if (existing) return existing;
-  const to = (_a = prevKf.tangentOut) != null ? _a : prevKf.to;
-  const ti = (_b = nextKf.tangentIn) != null ? _b : nextKf.ti;
+  const to = kfTangentOut(prevKf);
+  const ti = kfTangentIn(nextKf);
   const P1 = [prevPos[0] + (to ? to[0] : 0), prevPos[1] + (to ? to[1] : 0)];
   const P2 = [nextPos[0] + (ti ? ti[0] : 0), nextPos[1] + (ti ? ti[1] : 0)];
   const lut = bezier2D_arcLengthLUT(prevPos, P1, P2, nextPos);
@@ -1955,13 +2472,13 @@ function tFromArcFraction(lut, arcFrac) {
 var DEFAULT_FLATNESS_TOL = 0.5;
 var DEFAULT_ROTATION_TOL = 5;
 var DEFAULT_MAX_SAMPLES = 32;
-function materialiseMotionPathInPropAnim(anim, opts) {
-  var _a, _b, _c;
+function materializeMotionPathInPropAnim(anim, opts) {
+  var _a2, _b, _c;
   if (!propAnimIsMotionPath(anim)) return anim;
   const kfs = anim.keyframes;
   if (!Array.isArray(kfs) || kfs.length < 2) return anim;
   const autoOrient = !!anim.autoOrient;
-  const flatnessTol = (_a = opts == null ? void 0 : opts.flatnessTolerance) != null ? _a : DEFAULT_FLATNESS_TOL;
+  const flatnessTol = (_a2 = opts == null ? void 0 : opts.flatnessTolerance) != null ? _a2 : DEFAULT_FLATNESS_TOL;
   const rotationTol = (_b = opts == null ? void 0 : opts.rotationTolerance) != null ? _b : DEFAULT_ROTATION_TOL;
   const maxSamples = (_c = opts == null ? void 0 : opts.maxSamplesPerSegment) != null ? _c : DEFAULT_MAX_SAMPLES;
   const out = [];
@@ -1987,7 +2504,7 @@ function materialiseMotionPathInPropAnim(anim, opts) {
     if (autoOrient && i > 0) {
       insertSharpCornerStepKfIfNeeded(out, prevKf, nextKf, prevPos, nextPos, rotationTol);
     }
-    materialiseSegment(out, prevKf, nextKf, prevPos, nextPos, autoOrient, flatnessTol, rotationTol, maxSamples);
+    materializeSegment(out, prevKf, nextKf, prevPos, nextPos, autoOrient, flatnessTol, rotationTol, maxSamples);
   }
   const lastInE = getKfEasing(kfs[kfs.length - 1]);
   if (lastInE) out[out.length - 1].e = lastInE;
@@ -1997,10 +2514,9 @@ function materialiseMotionPathInPropAnim(anim, opts) {
   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;
@@ -2017,8 +2533,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;
 }
@@ -2079,9 +2594,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);
@@ -2104,7 +2618,7 @@ function insertSharpCornerStepKfIfNeeded(out, prevKf, nextKf, prevPos, nextPos,
   out.push(makeOutKf(stepTime, dupValue));
 }
 var CORNER_STEP_AFTER_BOUNDARY_MS = 0.05;
-function materialiseSegment(out, prevKf, nextKf, prevPos, nextPos, autoOrient, flatnessTol, rotationTol, maxSamples) {
+function materializeSegment(out, prevKf, nextKf, prevPos, nextPos, autoOrient, flatnessTol, rotationTol, maxSamples) {
   const seg = getSegmentCache(prevKf, nextKf, prevPos, nextPos);
   const prevTime = getKfTime(prevKf);
   const nextTime = getKfTime(nextKf);
@@ -2227,16 +2741,16 @@ function perpDist(q, pA, pB) {
   const cross = (q[0] - pA[0]) * dy - (q[1] - pA[1]) * dx;
   return Math.abs(cross) / Math.sqrt(len2);
 }
-function materialiseMotionPathsInTree(root, opts) {
-  const out = walkAndMaterialise(root, opts);
+function materializeMotionPathsInTree(root, opts) {
+  const out = walkAndMaterialize(root, opts);
   return out != null ? out : root;
 }
-function walkAndMaterialise(node, opts) {
+function walkAndMaterialize(node, opts) {
   let newChildren;
   if (node.children) {
     for (let i = 0; i < node.children.length; i++) {
       const ch = node.children[i];
-      const ret = walkAndMaterialise(ch, opts);
+      const ret = walkAndMaterialize(ch, opts);
       if (ret !== null) {
         if (!newChildren) newChildren = node.children.slice();
         newChildren[i] = ret;
@@ -2249,9 +2763,9 @@ function walkAndMaterialise(node, opts) {
     const animDef = animBucket;
     const transformAnim = animDef.transform;
     if (transformAnim && typeof transformAnim === "object" && propAnimIsMotionPath(transformAnim)) {
-      const materialised = materialiseMotionPathInPropAnim(transformAnim, opts);
-      if (materialised !== transformAnim) {
-        newAnimate = __spreadProps2(__spreadValues2({}, animDef), { transform: materialised });
+      const materialized = materializeMotionPathInPropAnim(transformAnim, opts);
+      if (materialized !== transformAnim) {
+        newAnimate = __spreadProps2(__spreadValues2({}, animDef), { transform: materialized });
       }
     }
   }
@@ -2352,8 +2866,8 @@ function isPathString(value) {
   return typeof value === "string" && extractPathData(value) !== void 0;
 }
 function normalizePathValue(value) {
-  if (value && typeof value === "object" && typeof value.path === "string") {
-    const d = extractPathData(value.path);
+  if (value && typeof value === "object" && typeof value.pathData === "string") {
+    const d = extractPathData(value.pathData);
     return d ? { paths: parseSvgPathToBezier(d) } : value;
   }
   if (value && typeof value === "object" && "paths" in value) {
@@ -2392,21 +2906,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);
     }
@@ -2431,13 +2945,13 @@ 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) };
   }
-  if (COLOUR_ATTR_NAMES.has(propName)) {
+  if (COLOR_ATTR_NAMES.has(propName)) {
     return interpolateColor(a || [0, 0, 0, 1], b || [0, 0, 0, 1], t);
   }
   if (propName === "transform" && typeof a === "object" && a !== null && !Array.isArray(a) && typeof b === "object" && b !== null && !Array.isArray(b)) {
@@ -2469,11 +2983,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);
@@ -2481,7 +2995,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 {
@@ -2494,26 +3008,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 = [];
@@ -2550,7 +3061,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) {
@@ -2616,30 +3127,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) {
@@ -2651,34 +3162,34 @@ function expandLoopKeyframes(propName, keyframes, loop, duration) {
   }
 }
 function normalizeKeyframes(propName, propAnim, duration, defs) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a2;
   const keyframes = propAnim.keyframes || [];
   const normalized = [];
   for (const kf of keyframes) {
-    const timePct = (_b = (_a = kf.time) != null ? _a : kf.t) != null ? _b : 0;
-    let value = (_c = kf.value) != null ? _c : kf.v;
-    const easing = (_d = kf.easing) != null ? _d : kf.e;
+    const timePct = kfTime(kf);
+    let value = kfValue(kf);
+    const easing = kfEasing(kf);
     if (propName === "d") {
       value = normalizePathValue(value);
     }
     const propNameKebab = isCamelCaseWord(propName) ? camelCaseToKebabWordIfNeeded(propName) : propName;
-    if (COLOUR_ATTR_NAMES.has(propNameKebab)) {
-      value = (_e = parseColor(value)) != null ? _e : value;
+    if (COLOR_ATTR_NAMES.has(propNameKebab)) {
+      value = (_a2 = parseColor(value)) != null ? _a2 : value;
     }
     const normKf = {
       t: timePct,
       v: value,
       e: resolveEasing(easing, defs)
     };
-    const tIn = (_f = kf.tangentIn) != null ? _f : kf.ti;
-    const tOut = (_g = kf.tangentOut) != null ? _g : kf.to;
+    const tIn = kfTangentIn(kf);
+    const tOut = kfTangentOut(kf);
     if (tIn) normKf.tangentIn = tIn;
     if (tOut) normKf.tangentOut = tOut;
     normalized.push(normKf);
   }
   normalized.sort((a, b) => {
-    var _a2, _b2;
-    return ((_a2 = a.t) != null ? _a2 : 0) - ((_b2 = b.t) != null ? _b2 : 0);
+    var _a3, _b;
+    return ((_a3 = a.t) != null ? _a3 : 0) - ((_b = b.t) != null ? _b : 0);
   });
   const loopRaw = propAnim.loop;
   const loop = loopRaw === true ? {} : loopRaw || void 0;
@@ -2696,24 +3207,26 @@ function mergeAnimationDefinitions(animations) {
   }
   return merged;
 }
-function materialiseInternalLoopsInPropAnim(propName, propAnim, duration) {
+function materializeInternalLoopsInPropAnim(propName, propAnim, duration) {
   const loopRaw = propAnim.loop;
   if (loopRaw === void 0 || loopRaw === null || loopRaw === false) return propAnim;
   const loop = loopRaw === true ? {} : loopRaw;
   const rawKfs = propAnim.keyframes;
   if (!Array.isArray(rawKfs) || rawKfs.length < 2) return propAnim;
   const propNameKebab = isCamelCaseWord(propName) ? camelCaseToKebabWordIfNeeded(propName) : propName;
-  const isColour = COLOUR_ATTR_NAMES.has(propNameKebab);
+  const isColor = COLOR_ATTR_NAMES.has(propNameKebab);
   const kfs = rawKfs.map((kf) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    const t = (_a = kf.t) != null ? _a : kf.time;
-    let v = (_b = kf.v) != null ? _b : kf.value;
+    var _a2;
+    const t = kfTime(kf);
+    let v = kfValue(kf);
     if (propName === "d") v = normalizePathValue(v);
-    if (isColour) v = (_c = parseColor(v)) != null ? _c : v;
-    const e = (_d = kf.e) != null ? _d : kf.easing;
+    if (isColor) v = (_a2 = parseColor(v)) != null ? _a2 : v;
+    const e = kfEasing(kf);
     const out2 = { t, v, e };
-    if ((_e = kf.tangentIn) != null ? _e : kf.ti) out2.tangentIn = (_f = kf.tangentIn) != null ? _f : kf.ti;
-    if ((_g = kf.tangentOut) != null ? _g : kf.to) out2.tangentOut = (_h = kf.tangentOut) != null ? _h : kf.to;
+    const tIn = kfTangentIn(kf);
+    const tOut = kfTangentOut(kf);
+    if (tIn) out2.tangentIn = tIn;
+    if (tOut) out2.tangentOut = tOut;
     return out2;
   });
   const expanded = expandLoopKeyframes(propName, kfs, loop, duration);
@@ -2721,15 +3234,15 @@ function materialiseInternalLoopsInPropAnim(propName, propAnim, duration) {
   if (propAnim.autoOrient !== void 0) out.autoOrient = propAnim.autoOrient;
   return out;
 }
-function materialiseInternalLoopsInTree(root, duration) {
-  const ret = walkAndMaterialiseLoops(root, duration);
+function materializeInternalLoopsInTree(root, duration) {
+  const ret = walkAndMaterializeLoops(root, duration);
   return ret != null ? ret : root;
 }
-function walkAndMaterialiseLoops(node, duration) {
+function walkAndMaterializeLoops(node, duration) {
   let newChildren;
   if (node.children) {
     for (let i = 0; i < node.children.length; i++) {
-      const ret = walkAndMaterialiseLoops(node.children[i], duration);
+      const ret = walkAndMaterializeLoops(node.children[i], duration);
       if (ret !== null) {
         if (!newChildren) newChildren = node.children.slice();
         newChildren[i] = ret;
@@ -2742,10 +3255,10 @@ function walkAndMaterialiseLoops(node, duration) {
     const animDef = animBucket;
     for (const propName of Object.keys(animDef)) {
       const propAnim = animDef[propName];
-      const materialised = materialiseInternalLoopsInPropAnim(propName, propAnim, duration);
-      if (materialised !== propAnim) {
+      const materialized = materializeInternalLoopsInPropAnim(propName, propAnim, duration);
+      if (materialized !== propAnim) {
         if (!newAnimate) newAnimate = __spreadValues2({}, animDef);
-        newAnimate[propName] = materialised;
+        newAnimate[propName] = materialized;
       }
     }
   }
@@ -2764,7 +3277,7 @@ function mergeStaticTransformIntoAnimDef(animDef, staticTransform) {
   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"];
+  const transformAnim = animDef[TRANSFORM_ATTR];
   if (transformAnim && typeof transformAnim === "object") {
     const anim = transformAnim;
     if (Array.isArray(anim.keyframes)) {
@@ -2789,7 +3302,7 @@ function mergeStaticTransformIntoAnimDef(animDef, staticTransform) {
   delete rest[ch];
   return __spreadProps2(__spreadValues2({}, rest), { transform: lifted });
 }
-function normalizeAnimationDefinition(animDef, duration, defs, engine = PxAnimatorEngine.waapi) {
+function normalizeAnimationDefinition(animDef, duration, defs, engine = PxTimelineEngine.native) {
   const normalized = {};
   for (const [propName, propAnim] of Object.entries(animDef)) {
     if (propName === "transform" && propAnim.alongPathMode === "offsetPath" && animDef["offsetDistance"] !== void 0) {
@@ -2800,12 +3313,12 @@ function normalizeAnimationDefinition(animDef, duration, defs, engine = PxAnimat
       const out = { keyframes: normalizedKfs };
       if (propAnim.autoOrient !== void 0) out.autoOrient = propAnim.autoOrient;
       if (propAnim.loop !== void 0) out.loop = propAnim.loop;
-      normalized[propName] = engine === PxAnimatorEngine.waapi && propName === "transform" ? materialiseMotionPathInPropAnim(out) : out;
+      normalized[propName] = engine === PxTimelineEngine.native && propName === "transform" ? materializeMotionPathInPropAnim(out) : out;
     }
   }
   return normalized;
 }
-function getNormalisedBindings(doc, engine = PxAnimatorEngine.waapi) {
+function getNormalizedBindings(doc, engine = PxTimelineEngine.native) {
   const animatorConfig = getAnimatorConfig(doc) || {};
   const defs = getDefs(doc);
   const duration = animatorConfig.duration || 1e3;
@@ -2851,12 +3364,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];
@@ -2871,13 +3384,13 @@ function getKeyframesPair(keyframes, progress) {
   return { prevKf, nextKf };
 }
 function calcPropertyValue(propName, propAnim, progress) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a2, _b, _c, _d;
   const keyframes = propAnim.keyframes || [];
   if (keyframes.length === 0) return null;
   const { prevKf, nextKf } = getKeyframesPair(keyframes, progress);
-  let localProgress = prevKf === nextKf ? 0 : remap(progress, (_a = prevKf.t) != null ? _a : 0, (_b = nextKf.t) != null ? _b : 0, 0, 1);
+  let localProgress = prevKf === nextKf ? 0 : remap(progress, (_a2 = prevKf.t) != null ? _a2 : 0, (_b = nextKf.t) != null ? _b : 0, 0, 1);
   localProgress = clamp(localProgress, 0, 1);
-  const easing = (_c = prevKf.e) != null ? _c : prevKf.easing;
+  const easing = kfEasing(prevKf);
   if (easing && Array.isArray(easing)) {
     try {
       localProgress = cubicBezier(easing)(localProgress);
@@ -2886,17 +3399,17 @@ 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,
       localProgress
     ).map((bz) => bezierToSvgPath(bz)).join("");
-  } else if (COLOUR_ATTR_NAMES.has(cssAttrName)) {
+  } else if (COLOR_ATTR_NAMES.has(cssAttrName)) {
     cssValue = toRGBA(interpolateColor(
       prevV || [0, 0, 0, 1],
       nextV || [0, 0, 0, 1],
@@ -3002,13 +3515,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) => {
@@ -3016,7 +3529,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;
@@ -3028,7 +3541,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;
@@ -3038,7 +3551,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;
@@ -3047,15 +3560,15 @@ 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;
   }
   return gNode;
 }
-function materialiseAnimatedUseInstances(root) {
-  var _a;
+function materializeAnimatedUseInstances(root) {
+  var _a2;
   const idMap = buildIdMap(root);
   const animatedIds = computeAnimatedSubtreeIds(root, idMap);
   if (animatedIds.size === 0) return root;
@@ -3063,10 +3576,10 @@ function materialiseAnimatedUseInstances(root) {
   const genId3 = () => "_lw_use_mat_" + ++idCounter;
   const rootViewport = readRootViewport(root);
   const defsCollector = [];
-  const walked = walkAndMaterialise2(root, idMap, animatedIds, genId3, defsCollector, rootViewport);
+  const walked = walkAndMaterialize2(root, idMap, animatedIds, genId3, defsCollector, rootViewport);
   if (defsCollector.length === 0) return walked;
   const defsNode = { type: "defs", children: defsCollector };
-  const newChildren = [...(_a = walked.children) != null ? _a : [], defsNode];
+  const newChildren = [...(_a2 = walked.children) != null ? _a2 : [], defsNode];
   return __spreadProps2(__spreadValues2({}, walked), { children: newChildren });
 }
 function readRootViewport(root) {
@@ -3088,9 +3601,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;
@@ -3136,16 +3649,16 @@ function stripHash(href) {
   if (typeof href !== "string") return void 0;
   return href.startsWith("#") ? href.slice(1) : href;
 }
-function materialiseOneUse(useNode, target, idMap, animatedIds, genId3, defsCollector, rootViewport) {
-  var _a, _b, _c, _d;
+function materializeOneUse(useNode, target, idMap, animatedIds, genId3, defsCollector, rootViewport) {
+  var _a2, _b, _c, _d;
   const clone2 = deepClonePxNode(target);
   regenerateIdsAndRewriteRefs(clone2, genId3);
   const symbolViewBox = clone2.type === "symbol" ? parseViewBox(clone2.viewBox) : void 0;
-  const useW = (_b = (_a = numericAttr(useNode.width)) != null ? _a : symbolViewBox == null ? void 0 : symbolViewBox[2]) != null ? _b : rootViewport[0];
+  const useW = (_b = (_a2 = numericAttr(useNode.width)) != null ? _a2 : symbolViewBox == null ? void 0 : symbolViewBox[2]) != null ? _b : rootViewport[0];
   const useH = (_d = (_c = numericAttr(useNode.height)) != null ? _c : symbolViewBox == null ? void 0 : symbolViewBox[3]) != null ? _d : rootViewport[1];
   const rewrittenClone = clone2.type === "symbol" ? rewriteSymbolRootToGroup(clone2, genId3, defsCollector, useW, useH) : clone2;
-  const materialisedClone = walkAndMaterialise2(rewrittenClone, idMap, animatedIds, genId3, defsCollector, rootViewport);
-  const newNode = __spreadProps2(__spreadValues2({}, useNode), { type: "g", children: [materialisedClone] });
+  const materializedClone = walkAndMaterialize2(rewrittenClone, idMap, animatedIds, genId3, defsCollector, rootViewport);
+  const newNode = __spreadProps2(__spreadValues2({}, useNode), { type: "g", children: [materializedClone] });
   delete newNode.href;
   delete newNode.width;
   delete newNode.height;
@@ -3183,18 +3696,18 @@ function parseViewBox(v) {
   if (parts.length < 4 || parts.some((n) => !Number.isFinite(n))) return void 0;
   return [parts[0], parts[1], parts[2], parts[3]];
 }
-function walkAndMaterialise2(node, idMap, animatedIds, genId3, defsCollector, rootViewport) {
+function walkAndMaterialize2(node, idMap, animatedIds, genId3, defsCollector, rootViewport) {
   if (node.type === "use" && typeof node.href === "string") {
     const targetId = stripHash(node.href);
     if (targetId && animatedIds.has(targetId)) {
       const target = idMap.get(targetId);
-      if (target) return materialiseOneUse(node, target, idMap, animatedIds, genId3, defsCollector, rootViewport);
+      if (target) return materializeOneUse(node, target, idMap, animatedIds, genId3, defsCollector, rootViewport);
     }
   }
   if (!node.children) return node;
   let changed = false;
   const newChildren = node.children.map((ch) => {
-    const m = walkAndMaterialise2(ch, idMap, animatedIds, genId3, defsCollector, rootViewport);
+    const m = walkAndMaterialize2(ch, idMap, animatedIds, genId3, defsCollector, rootViewport);
     if (m !== ch) changed = true;
     return m;
   });
@@ -3210,7 +3723,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 */
@@ -3218,20 +3731,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 out = { kind: "animated", keyframes: kfs.map(normalizeKeyframe), autoOrient: obj.autoOrient, loop: obj.loop };
+      const base = (_a2 = obj.value) != null ? _a2 : obj.v;
       if (base !== void 0 && out.kind === "animated") 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") {
@@ -3245,10 +3758,10 @@ 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) {
+function normalizeKeyframe(kf) {
   if (!kf || typeof kf !== "object") return kf;
   const k = kf;
   if (k.t === void 0 && k.v === void 0 && k.e === void 0 && k.to === void 0 && k.ti === void 0) {
@@ -3263,12 +3776,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 };
@@ -3374,9 +3887,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;
@@ -3388,9 +3901,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));
     }
@@ -3415,10 +3928,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);
@@ -3634,7 +4147,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") {
@@ -3653,7 +4166,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;
@@ -3669,7 +4182,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 [];
@@ -3679,14 +4192,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));
@@ -3699,16 +4212,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);
@@ -3735,13 +4248,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;
@@ -3751,10 +4263,10 @@ function formatOffset(o) {
   return pct + "%";
 }
 function applyClipPathEffect(node, fx, ctx) {
-  if (!(fx == null ? void 0 : fx.d)) return node;
+  if (!(fx == null ? void 0 : fx.pathData)) return node;
   const clipId = genId(ctx, "clip");
   const pathChild = { type: "path" };
-  const read = readAnimatable(fx.d);
+  const read = readAnimatable(fx.pathData);
   if (read.kind !== "absent") {
     if (read.kind === "static") {
       pathChild.d = pathString(read.value);
@@ -3769,14 +4281,14 @@ function applyClipPathEffect(node, fx, ctx) {
 }
 function pathString(v) {
   if (typeof v === "string") return v;
-  if (v && typeof v === "object" && typeof v.path === "string") return v.path;
+  if (v && typeof v === "object" && typeof v.pathData === "string") return v.pathData;
   return void 0;
 }
 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");
@@ -3814,8 +4326,8 @@ function wrapInverseTransform(inner, fx, ctx) {
 }
 function wrapInversePart(inner, part, raw, origin, ctx) {
   if (raw === void 0) return inner;
-  const normalisedRaw = part === "scale" && Array.isArray(raw) ? [raw[0] / 100, raw[1] / 100] : raw;
-  const v = readAnimatable(normalisedRaw);
+  const normalizedRaw = part === "scale" && Array.isArray(raw) ? [raw[0] / 100, raw[1] / 100] : raw;
+  const v = readAnimatable(normalizedRaw);
   if (v.kind === "static") {
     return { type: "g", transform: { value: partsRecord(part, invertPartValue(part, v.value), origin) }, children: [inner] };
   }
@@ -3839,16 +4351,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;
@@ -3857,7 +4369,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]] } }));
@@ -3921,7 +4433,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 = [];
@@ -3935,7 +4447,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;
@@ -4050,8 +4562,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);
@@ -4072,7 +4584,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;
@@ -4080,7 +4592,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)) {
@@ -4094,7 +4606,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] });
@@ -4127,15 +4639,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) {
@@ -4143,9 +4654,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;
@@ -4211,10 +4722,10 @@ function synthesiseScale(raw, i) {
   const scalePower = (v) => [Math.pow(v[0], i), Math.pow(v[1], i)];
   return mapAnimatable(raw, scalePower, true);
 }
-var RETIME_MATERIALISATION_MODE_INLINE_G = false;
+var RETIME_MATERIALIZATION_MODE_INLINE_G = false;
 function asRetime(r) {
-  var _a, _b;
-  return { start: (_a = r.start) != null ? _a : 0, stretch: (_b = r.stretch) != null ? _b : 1 };
+  var _a2, _b;
+  return { start: (_a2 = r.start) != null ? _a2 : 0, stretch: (_b = r.stretch) != null ? _b : 1 };
 }
 var CROP_EDGE_MS = 1;
 function applyTimeCrop(useNode, crop, ctx) {
@@ -4242,12 +4753,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;
@@ -4258,9 +4769,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();
@@ -4268,7 +4779,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) {
@@ -4278,7 +4789,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) {
@@ -4288,19 +4799,19 @@ 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);
     if (!retime) continue;
     const crop = retime.timeCrop;
     clearCloneRetime(useNode);
-    materialiseRetime(useNode, asRetime(retime), ctx);
+    materializeRetime(useNode, asRetime(retime), ctx);
     if (crop) applyTimeCrop(useNode, crop, ctx);
   }
 }
-function materialiseRetime(useNode, retime, ctx) {
+function materializeRetime(useNode, retime, ctx) {
   const targetId = stripHash2(useNode.href);
   if (!targetId) {
     ctx.errors.push("retime: <use> has no href to follow");
@@ -4308,7 +4819,7 @@ function materialiseRetime(useNode, retime, ctx) {
   }
   const chainRootId = buildChainClone(targetId, retime, ctx, /* @__PURE__ */ new Set());
   if (!chainRootId) return;
-  if (RETIME_MATERIALISATION_MODE_INLINE_G) {
+  if (RETIME_MATERIALIZATION_MODE_INLINE_G) {
     const cloneNode = ctx.idMap.get(chainRootId);
     useNode.type = "g";
     delete useNode.href;
@@ -4348,15 +4859,15 @@ function buildChainClone(targetId, accum, ctx, chain) {
       if (subId2) cloneNode.href = "#" + subId2;
     }
   } else {
-    materialiseNestedRetimeUses(cloneNode, accum, ctx, chain, targetId);
+    materializeNestedRetimeUses(cloneNode, accum, ctx, chain, targetId);
   }
   ctx.defs.push(cloneNode);
   if (typeof cloneNode.id === "string") ctx.idMap.set(cloneNode.id, cloneNode);
   return typeof cloneNode.id === "string" ? cloneNode.id : void 0;
 }
-function materialiseNestedRetimeUses(node, accum, ctx, chain, parentTargetId) {
+function materializeNestedRetimeUses(node, accum, ctx, chain, parentTargetId) {
   const visit = (n) => {
-    var _a;
+    var _a2;
     const retime = readCloneRetime(n);
     if (n.type === "use" && retime && n.href) {
       const subId = stripHash2(n.href);
@@ -4369,14 +4880,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) => {
@@ -4551,10 +5062,10 @@ 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;
+    const fs = parseFloat(String((_a2 = el.fontSize) != null ? _a2 : "")) || 0;
     if (fs) maxFont = Math.max(maxFont, fs);
-    const t = (_b = el.text) != null ? _b : el.textContent;
+    const t = el.textContent;
     if (typeof t === "string") chars += t.length;
     if (el.children) for (const c of el.children) walk(c);
   };
@@ -4576,14 +5087,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;
@@ -4604,10 +5115,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,
@@ -4617,7 +5128,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;
@@ -4703,7 +5214,6 @@ var TEXT_ATTR_KEYS = [
   "stroke",
   "strokeWidth",
   "effects",
-  TEXT_ATTR,
   TEXT_CONTENT_ATTR,
   "xml:space"
 ];
@@ -4741,15 +5251,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,
@@ -4766,10 +5276,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,
@@ -4790,9 +5300,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) {
@@ -4813,26 +5323,26 @@ function missingGlyphBoxEm(advanceEm, ascentEm) {
   const ix0 = x0 + t, ix1 = x1 - t, iyb = -t, iyt = y1 + t;
   return outer + "M" + ix0 + " " + iyb + "L" + ix0 + " " + iyt + "L" + ix1 + " " + iyt + "L" + ix1 + " " + iyb + "Z";
 }
-function materialiseGlyphTextHorizontal(node, opts) {
-  var _a, _b, _c, _d;
+function materializeGlyphTextHorizontal(node, opts) {
+  var _a2, _b, _c;
   const { glyphs, create = jsonElementFactory, warnings } = opts;
   const soleFont = soleFontOf(glyphs);
-  const pen = { x: (_a = parseLen(node.x)) != null ? _a : 0, y: (_b = parseLen(node.y)) != null ? _b : 0 };
+  const pen = { x: (_a2 = parseLen(node.x)) != null ? _a2 : 0, y: (_b = parseLen(node.y)) != null ? _b : 0 };
   const placements = [];
   const lines = [{ start: pen.x, end: pen.x }];
   let line = 0;
   const renderChars = (content, s) => {
-    var _a2;
+    var _a3;
     const gf = glyphFontFor(s, glyphs, soleFont, warnings);
     const upm = (gf == null ? void 0 : gf.unitsPerEm) || 1e3;
     const scale = s.fontSize / upm;
-    const ascentEm = (_a2 = gf == null ? void 0 : gf.ascent) != null ? _a2 : 0.9 * upm;
+    const ascentEm = (_a3 = gf == null ? void 0 : gf.ascent) != null ? _a3 : 0.9 * upm;
     const paint = paintOf(s);
     for (let i = 0; i < content.length; i++) {
       const ch = content.charAt(i);
       const g = gf == null ? void 0 : gf.glyphs[ch];
-      if (g && g.d) {
-        placements.push({ glyphD: g.d, m: [scale, 0, 0, scale, pen.x, pen.y], paint, line, x: pen.x, y: pen.y, scale });
+      if (g && g.pathData) {
+        placements.push({ glyphD: g.pathData, m: [scale, 0, 0, scale, pen.x, pen.y], paint, line, x: pen.x, y: pen.y, scale });
         pen.x += g.width * scale;
       } else if (/\S/.test(ch)) {
         const advEm = g && g.width > 0 ? g.width : MISSING_GLYPH_ADVANCE_EM * upm;
@@ -4846,7 +5356,7 @@ function materialiseGlyphTextHorizontal(node, opts) {
     }
   };
   const walk = (el, parentStyle) => {
-    var _a2, _b2, _c2, _d2;
+    var _a3, _b2, _c2;
     const s = resolveStyle2(el, parentStyle);
     const x = parseLen(el.x);
     const y = parseLen(el.y);
@@ -4856,16 +5366,16 @@ 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);
+    const content = str(el[TEXT_CONTENT_ATTR]);
+    if (content && !((_c2 = el.children) == null ? void 0 : _c2.length)) renderChars(content, s);
     if (el.children) for (const ch of el.children) walk(ch, s);
   };
   const rootStyle = rootStyleOf(node);
   if (node.children) for (const ch of node.children) walk(ch, rootStyle);
-  const rootContent = (_c = str(node[TEXT_CONTENT_ATTR])) != null ? _c : str(node[TEXT_ATTR]);
-  if (rootContent && !((_d = node.children) == null ? void 0 : _d.length)) renderChars(rootContent, rootStyle);
+  const rootContent = str(node[TEXT_CONTENT_ATTR]);
+  if (rootContent && !((_c = node.children) == null ? void 0 : _c.length)) renderChars(rootContent, rootStyle);
   const anchor = str(node.textAnchor);
   if (anchor === "middle" || anchor === "end") {
     for (const p of placements) {
@@ -4877,8 +5387,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;
+  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 };
@@ -4886,11 +5396,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];
@@ -4901,7 +5411,7 @@ function layoutGlyphTextChars(node, opts) {
     }
   };
   const walk = (el, parentStyle) => {
-    var _a2, _b2, _c2, _d2;
+    var _a3, _b2, _c2;
     const s = resolveStyle2(el, parentStyle);
     const x = parseLen(el.x);
     const y = parseLen(el.y);
@@ -4911,10 +5421,10 @@ 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);
+    const content = str(el[TEXT_CONTENT_ATTR]);
+    if (content && !((_c2 = el.children) == null ? void 0 : _c2.length)) renderChars(content, s);
     if (el.children) for (const ch of el.children) walk(ch, s);
   };
   const rootStyle = rootStyleOf(node);
@@ -4928,8 +5438,8 @@ function layoutGlyphTextChars(node, opts) {
       boxes.push({ x: pen.x, y: pen.y, width: 0, ascent: ((_d = gf == null ? void 0 : gf.ascent) != null ? _d : 0.9 * upm) * (s.fontSize / upm), fontSize: s.fontSize, line });
     }
   }
-  const rootContent = (_e = str(node[TEXT_CONTENT_ATTR])) != null ? _e : str(node[TEXT_ATTR]);
-  if (rootContent && !((_f = node.children) == null ? void 0 : _f.length)) renderChars(rootContent, rootStyle);
+  const rootContent = str(node[TEXT_CONTENT_ATTR]);
+  if (rootContent && !((_e = node.children) == null ? void 0 : _e.length)) renderChars(rootContent, rootStyle);
   const anchor = str(node.textAnchor);
   if (anchor === "middle" || anchor === "end") {
     for (const b of boxes) {
@@ -4937,13 +5447,13 @@ function layoutGlyphTextChars(node, opts) {
       b.x += anchor === "middle" ? -w / 2 : -w;
     }
   }
-  return boxes.map((_g) => {
-    var _h = _g, { line: _l } = _h, b = __objRest2(_h, ["line"]);
+  return boxes.map((_f) => {
+    var _g = _f, { line: _l } = _g, b = __objRest2(_g, ["line"]);
     return b;
   });
 }
 function layoutGlyphTextCharsAlongPath(node, pathD, opts) {
-  var _a, _b;
+  var _a2, _b;
   const { glyphs, warnings, alongPath } = opts;
   const sampler = createPathSampler(pathD);
   if (!sampler) {
@@ -4954,14 +5464,14 @@ function layoutGlyphTextCharsAlongPath(node, pathD, opts) {
   const chars = [];
   let adv = 0;
   const walk = (el, parentStyle) => {
-    var _a2, _b2, _c;
+    var _a3, _b2;
     const s = resolveStyle2(el, parentStyle);
-    const content = (_a2 = str(el[TEXT_CONTENT_ATTR])) != null ? _a2 : str(el[TEXT_ATTR]);
-    if (content && !((_b2 = el.children) == null ? void 0 : _b2.length)) {
+    const content = str(el[TEXT_CONTENT_ATTR]);
+    if (content && !((_a3 = el.children) == null ? void 0 : _a3.length)) {
       const gf = glyphFontFor(s, glyphs, soleFont, warnings);
       const upm = (gf == null ? void 0 : gf.unitsPerEm) || 1e3;
       const scale = s.fontSize / upm;
-      const ascent = ((_c = gf == null ? void 0 : gf.ascent) != null ? _c : 0.9 * upm) * scale;
+      const ascent = ((_b2 = gf == null ? void 0 : gf.ascent) != null ? _b2 : 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];
@@ -4976,7 +5486,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);
@@ -5008,21 +5518,21 @@ function collectAlongPathCells(node, glyphs, soleFont, warnings) {
   const cells = [];
   let adv = 0;
   const walk = (el, parentStyle) => {
-    var _a, _b, _c;
+    var _a2, _b;
     const s = resolveStyle2(el, parentStyle);
-    const content = (_a = str(el[TEXT_CONTENT_ATTR])) != null ? _a : str(el[TEXT_ATTR]);
-    if (content && !((_b = el.children) == null ? void 0 : _b.length)) {
+    const content = str(el[TEXT_CONTENT_ATTR]);
+    if (content && !((_a2 = el.children) == null ? void 0 : _a2.length)) {
       const gf = glyphFontFor(s, glyphs, soleFont, warnings);
       if (gf) {
         const scale = s.fontSize / gf.unitsPerEm;
-        const ascentEm = (_c = gf.ascent) != null ? _c : 0.9 * gf.unitsPerEm;
+        const ascentEm = (_b = gf.ascent) != null ? _b : 0.9 * gf.unitsPerEm;
         const paint = paintOf(s);
         for (let i = 0; i < content.length; i++) {
           const ch = content.charAt(i);
           const g = gf.glyphs[ch];
-          if (g && g.d) {
+          if (g && g.pathData) {
             const glyphAdv = g.width * scale;
-            cells.push({ glyphD: g.d, widthEm: g.width, scale, paint, midBase: adv + glyphAdv / 2 });
+            cells.push({ glyphD: g.pathData, widthEm: g.width, scale, paint, midBase: adv + glyphAdv / 2 });
             adv += glyphAdv;
           } else if (/\S/.test(ch)) {
             const wEm = g && g.width > 0 ? g.width : MISSING_GLYPH_ADVANCE_EM * gf.unitsPerEm;
@@ -5047,13 +5557,13 @@ 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
   };
 }
-function materialiseGlyphTextAlongPath(node, pathD, startOffset, opts, textLength, pathOverflow) {
+function materializeGlyphTextAlongPath(node, pathD, startOffset, opts, textLength, pathOverflow) {
   const { glyphs, create = jsonElementFactory, warnings } = opts;
   const sampler = pathD ? createPathSampler(pathD) : null;
   if (!sampler) {
@@ -5089,7 +5599,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));
@@ -5112,7 +5622,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) {
@@ -5132,8 +5642,8 @@ function buildAnimatedAlongPath(cells, sampler, distOf, times, loop, create, isC
   const onPath = (dist) => dist >= 0 && dist <= sampler.totalLength;
   const out = [];
   for (const c of cells) {
-    const centred = [c.scale, 0, 0, c.scale, -c.scale * (c.widthEm / 2), 0];
-    const d = transformPathData(c.glyphD, centred);
+    const centered = [c.scale, 0, 0, c.scale, -c.scale * (c.widthEm / 2), 0];
+    const d = transformPathData(c.glyphD, centered);
     const sampleKf = (dist, time) => {
       const { x, y, angle } = sampler.sampleAtDistance(dist);
       const cos = Math.cos(angle), sin = Math.sin(angle);
@@ -5194,7 +5704,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) {
@@ -5231,24 +5741,24 @@ function toGroup(node, children, create) {
   }
   return create("g", gProps, children);
 }
-function materialiseGlyphText(node, opts) {
-  if (opts.alongPath) return materialiseGlyphTextAlongPath(node, opts.alongPath.pathD, opts.alongPath.startOffset, opts, opts.alongPath.textLength, opts.alongPath.pathOverflow);
-  return materialiseGlyphTextHorizontal(node, opts);
+function materializeGlyphText(node, opts) {
+  if (opts.alongPath) return materializeGlyphTextAlongPath(node, opts.alongPath.pathD, opts.alongPath.startOffset, opts, opts.alongPath.textLength, opts.alongPath.pathOverflow);
+  return materializeGlyphTextHorizontal(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 });
+  return materializeGlyphTextHorizontal(node, { glyphs: ctx.glyphs, warnings: ctx.warnings });
 }
 function applyTextGlyphsAlongPath(node, ctx, pathD, startOffset, textLength, pathOverflow) {
   if (!ctx.glyphs) {
-    ctx.warnings.push("textGlyphs: no definitions.glyphs");
+    ctx.warnings.push("textGlyphs: no definitions.fonts");
     return null;
   }
-  return materialiseGlyphTextAlongPath(node, pathD, startOffset, { glyphs: ctx.glyphs, warnings: ctx.warnings }, textLength, pathOverflow);
+  return materializeGlyphTextAlongPath(node, pathD, startOffset, { glyphs: ctx.glyphs, warnings: ctx.warnings }, textLength, pathOverflow);
 }
 function applyStrokeTrimEffect(node, strokeTrim, ctx) {
   if (!strokeTrim) return node;
@@ -5385,12 +5895,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;
@@ -5400,14 +5909,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
   };
 }
@@ -5417,7 +5923,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;
@@ -5425,7 +5930,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;
@@ -5435,10 +5940,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 });
@@ -5453,14 +5958,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 {
@@ -5557,20 +6059,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";
   }
@@ -5586,7 +6088,7 @@ function shapeToPathD(node) {
   return void 0;
 }
 function applyPlayerEffects(root) {
-  var _a, _b;
+  var _a2, _b;
   const ctx = {
     defs: [],
     warnings: [],
@@ -5597,8 +6099,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);
@@ -5621,7 +6123,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;
@@ -5653,26 +6155,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;
@@ -5696,7 +6178,7 @@ var fmt2 = (n) => {
   return Object.is(r, -0) ? "0" : String(r);
 };
 function buildOffsetPath(propAnim) {
-  var _a, _b, _c;
+  var _a2, _b, _c;
   if (propAnim.alongPathMode !== "offsetPath") return void 0;
   const kfs = propAnim.keyframes;
   if (!kfs || kfs.length < 2) return void 0;
@@ -5709,7 +6191,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 = (_a = v == null ? void 0 : v.origin) != null ? _a : [0, 0];
+    const o = (_a2 = v == null ? void 0 : v.origin) != null ? _a2 : [0, 0];
     if (o[0] !== anchor[0] || o[1] !== anchor[1]) return void 0;
     points.push([tr[0] + anchor[0], tr[1] + anchor[1]]);
   }
@@ -5738,9 +6220,9 @@ function buildOffsetPath(propAnim) {
   }
   return { pathStr: d, distanceKfs, autoOrient: !!propAnim.autoOrient, anchor };
 }
-function materialiseOffsetPathsInTree(root) {
+function materializeOffsetPathsInTree(root) {
   const walk = (node) => {
-    var _a;
+    var _a2;
     let out = node;
     const anim = node.animate;
     const transform = anim == null ? void 0 : anim["transform"];
@@ -5748,16 +6230,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), {
@@ -5773,7 +6255,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 });
     }
@@ -5781,15 +6263,15 @@ function materialiseOffsetPathsInTree(root) {
   };
   return walk(root);
 }
-function materialiseAllInTree(doc, engine, opts) {
-  var _a, _b;
+function materializeAllInTree(doc, engine, opts) {
+  var _a2, _b;
   let root = applyPlayerEffects(doc).root;
-  root = materialiseOffsetPathsInTree(root);
-  const duration = (_b = (_a = getAnimatorConfig(root)) == null ? void 0 : _a.duration) != null ? _b : DEFAULT_DURATION_MS;
-  root = materialiseInternalLoopsInTree(root, duration);
-  if (engine === PxAnimatorEngine.waapi) {
-    root = materialiseMotionPathsInTree(root, opts == null ? void 0 : opts.motionPath);
-    root = materialiseAnimatedUseInstances(root);
+  root = materializeOffsetPathsInTree(root);
+  const duration = (_b = (_a2 = getAnimatorConfig(root)) == null ? void 0 : _a2.duration) != null ? _b : DEFAULT_DURATION_MS;
+  root = materializeInternalLoopsInTree(root, duration);
+  if (engine === PxTimelineEngine.native) {
+    root = materializeMotionPathsInTree(root, opts == null ? void 0 : opts.motionPath);
+    root = materializeAnimatedUseInstances(root);
     root = pruneUnreferencedDefs(root);
   }
   return root;
@@ -5797,9 +6279,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) {
@@ -5823,6 +6305,38 @@ function pruneUnreferencedDefs(root) {
   }
   return root;
 }
+var PX_RATE_REJECTED = "setPlaybackRate: rate must be finite and non-zero";
+function isValidPlaybackRate(rate) {
+  return Number.isFinite(rate) && rate !== 0;
+}
+function seekCeilingMs(durationMs, iterations) {
+  if (!(durationMs > 0)) return 0;
+  if (iterations === Infinity) return Infinity;
+  return durationMs * (iterations > 0 ? iterations : 1);
+}
+function progressSpanMs(durationMs, iterations) {
+  if (!(durationMs > 0)) return 0;
+  if (iterations === Infinity) return durationMs;
+  return durationMs * (iterations > 0 ? iterations : 1);
+}
+function clampSeekMs(timeMs, ceilingMs) {
+  if (Number.isNaN(timeMs) || timeMs < 0) return 0;
+  if (Number.isFinite(ceilingMs)) return timeMs > ceilingMs ? ceilingMs : timeMs;
+  return Number.isFinite(timeMs) ? timeMs : 0;
+}
+function timeToProgress(timeMs, durationMs, iterations) {
+  const span = progressSpanMs(durationMs, iterations);
+  if (!(span > 0) || !Number.isFinite(timeMs)) return 0;
+  if (timeMs <= 0) return 0;
+  if (iterations === Infinity) return timeMs % span / span;
+  return timeMs >= span ? 1 : timeMs / span;
+}
+function progressToTimeMs(progress, durationMs, iterations) {
+  const span = progressSpanMs(durationMs, iterations);
+  if (!(span > 0) || !Number.isFinite(progress)) return 0;
+  if (progress <= 0) return 0;
+  return progress >= 1 ? span : progress * span;
+}
 function requestFrame(cb) {
   const g = globalThis;
   if (typeof g.requestAnimationFrame === "function") return g.requestAnimationFrame(cb);
@@ -5837,9 +6351,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 = getNormalizedBindings(doc, PxTimelineEngine.js);
   const _iterations = config.iterations;
   let iterations = 1;
   if (typeof _iterations === "number") iterations = _iterations || 1;
@@ -5848,7 +6362,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;
@@ -5910,7 +6424,7 @@ function createBasicFrameLoopAnimator(doc, adapter, callbacks) {
     }
   }
   const tick = () => {
-    var _a2, _b;
+    var _a3, _b;
     if (!adapter.isConnected()) {
       pauseAnim();
       return;
@@ -5926,7 +6440,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;
     }
@@ -6018,17 +6532,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 {
@@ -6043,7 +6557,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 = {
@@ -6053,14 +6567,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();
@@ -6069,8 +6583,8 @@ function createBasicFrameLoopAnimator(doc, adapter, callbacks) {
       finishAnim(true);
     },
     "setPlaybackRate": (rate) => {
-      if (!isFinite(rate) || rate === 0) {
-        console.warn("setPlaybackRate: rate must be finite and non-zero");
+      if (!isValidPlaybackRate(rate)) {
+        console.warn(PX_RATE_REJECTED);
         return;
       }
       let current = getRawAnimTime();
@@ -6084,21 +6598,67 @@ function createBasicFrameLoopAnimator(doc, adapter, callbacks) {
       return getAnimCurrentTime();
     },
     "setCurrentTime": (newTime) => {
-      if (newTime < 0) newTime = 0;
-      if (Number.isFinite(totalDuration) && newTime > totalDuration) newTime = totalDuration;
+      newTime = clampSeekMs(newTime, totalDuration);
       timeBeforeLastStartMs = newTime;
       if (playing) lastStartedTs = Date.now();
       if (!Number.isFinite(totalDuration) || newTime < totalDuration) finishCalled = false;
       renderFrame(getAnimCurrentTime());
     },
+    "getCurrentProgress": () => timeToProgress(getAnimCurrentTime(), duration, iterations),
+    "setCurrentProgress": (progress) => {
+      api.setCurrentTime(progressToTimeMs(progress, duration, iterations));
+    },
     "destroy": () => {
-      var _a2;
+      var _a3;
       api.cancel();
-      (_a2 = callbacks == null ? void 0 : callbacks.onRemove) == null ? void 0 : _a2.call(callbacks);
+      (_a3 = callbacks == null ? void 0 : callbacks.onRemove) == null ? void 0 : _a3.call(callbacks);
     }
   };
   return api;
 }
+var PxDiagnosticKind = {
+  /** The document is wrong — regenerate or repair the file. */
+  document: "document",
+  /** The page or app cannot provide what the document asks for — fix the mount. */
+  host: "host",
+  /** The platform cannot do it and the player degraded — usually nothing to fix. */
+  platform: "platform",
+  /** The call is wrong or self-contradictory — fix the options or props you passed. */
+  usage: "usage",
+  /** The player failed where it did not expect to — report it to us. */
+  internal: "internal"
+};
+function asError(error) {
+  return typeof error === "string" ? new Error(error) : error;
+}
+function isSilenced(silent, kind) {
+  if (!silent) return false;
+  return silent === true || silent.includes(kind);
+}
+function createDiagnostics(config, prefix) {
+  const tag = prefix ? prefix + " " : "";
+  return {
+    warn: (kind, message, detail) => {
+      if (config == null ? void 0 : config.onWarn) {
+        config.onWarn({ kind, message, detail });
+        return;
+      }
+      if (isSilenced(config == null ? void 0 : config.silent, kind)) return;
+      const line = tag + kind + ": " + message;
+      if (detail === void 0) console.warn(line);
+      else console.warn(line, detail);
+    },
+    error: (kind, error) => {
+      const err = asError(error);
+      if (config == null ? void 0 : config.onError) {
+        config.onError({ kind, message: err.message, error: err });
+        return;
+      }
+      if (isSilenced(config == null ? void 0 : config.silent, kind)) return;
+      console.error(tag + kind + ": " + err.message);
+    }
+  };
+}
 var IDENTITY = [1, 0, 0, 1, 0, 0];
 function mul(m, n) {
   return [
@@ -6148,9 +6708,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++;
@@ -6181,10 +6741,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++;
@@ -6197,9 +6757,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);
@@ -6208,7 +6768,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);
@@ -6217,14 +6777,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));
@@ -6233,7 +6793,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));
@@ -6246,33 +6806,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();
@@ -6306,14 +6866,205 @@ 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 foldTimelineOverride(timeline, shortcuts) {
+  let base;
+  if (typeof timeline === "string") {
+    try {
+      base = JSON.parse(timeline);
+    } catch (e) {
+      console.warn("timeline override: not valid JSON \u2014 ignored", e);
+      base = void 0;
+    }
+  } else {
+    base = timeline != null ? timeline : void 0;
+  }
+  const { duration, delay, iterations, startOn } = shortcuts;
+  if (duration === void 0 && delay === void 0 && iterations === void 0 && startOn === void 0) {
+    return base === void 0 ? void 0 : { timeline: base };
+  }
+  const out = isPlainObject(base) ? __spreadValues2({}, base) : {};
+  if (duration !== void 0) out.duration = duration;
+  if (delay !== void 0) out.delay = delay;
+  if (iterations !== void 0) out.iterations = iterations;
+  if (startOn !== void 0) {
+    out.trigger = __spreadProps2(__spreadValues2({}, out.trigger), { startOn });
+  }
+  return { timeline: out };
+}
+function mergeAnimatorConfig(base, patch) {
+  const warnings = [];
+  const warn = (m) => warnings.push(m);
+  if (patch === null) return { config: void 0, warnings };
+  if (!isPlainObject(patch) || Object.keys(patch).length === 0) {
+    return { config: base, warnings };
+  }
+  const flatInBase = isPlainObject(base) ? FLAT_ONLY_KEYS.filter((k) => base[k] !== void 0) : [];
+  if (flatInBase.length) {
+    warn("animator: the base carries the flat runtime spelling (" + flatInBase.join(", ") + "); the patch merges the wire spelling only");
+  }
+  const out = isPlainObject(base) ? __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;
+function diagnoseDocument(doc) {
+  try {
+    return { problems: validateDocument(doc) };
+  } catch (e) {
+    return { problems: [] };
+  }
+}
+function reportDocumentDiagnostics(doc, where) {
+  const { problems } = diagnoseDocument(doc);
+  if (!problems.length) return;
+  const shown = problems.slice(0, MAX_REPORTED);
+  const more = problems.length - shown.length;
+  console.warn(
+    where + ": this document does not match the animation schema in " + problems.length + " place" + (problems.length === 1 ? "" : "s") + ".\n" + shown.map((p) => "  - " + p).join("\n") + (more > 0 ? "\n  \u2026 and " + more + " more" : "") + "\n\nIf you did not author these keys, the usual cause is a build that MANGLES PROPERTY NAMES. An animation document is data loaded at runtime, so renaming the property reads inside the player stops them matching the keys in the JSON, and the animation silently does nothing. Feed the published reserved-name list to your minifier \u2014 @pixodesk/svg-animator-web/mangle-reserved.json \u2014 see docs/library/minification.md."
+  );
+}
+
+// src/shared/PxAnimatorCallbacks.ts
+function toEngineCallbacks(inline) {
+  const { onPlay, onPause, onCancel, onFinish, onRemove, onStop, onWarn, onError, silent } = inline != null ? inline : {};
+  const withStop = (own) => own || onStop ? () => {
+    own == null ? void 0 : own();
+    onStop == null ? void 0 : onStop();
+  } : void 0;
+  return {
+    onPlay,
+    onPause: withStop(onPause),
+    onCancel: withStop(onCancel),
+    onFinish: withStop(onFinish),
+    onRemove: withStop(onRemove),
+    onWarn,
+    onError,
+    silent
+  };
+}
 
-// src/PxAnimatorTriggers.ts
-function setupAnimationTriggers(api, config) {
-  const { startOn, outAction = "continue", scrollIntoViewThreshold = 0 } = config;
+// src/triggers/PxAnimatorTriggers.ts
+function setupAnimationTriggers(api, config, diag) {
+  const report = diag != null ? diag : createDiagnostics(void 0, "[PxAnimator]");
+  const cleanups = [];
+  const dispose = () => {
+    for (const undo of cleanups.splice(0)) undo();
+  };
+  const { startOn, outAction, scrollIntoViewThreshold } = resolveTrigger(config);
   const root = api.getRootElement();
   if (!root) {
-    console.warn("setupAnimationTriggers: No root element found for animation.");
-    return api;
+    report.warn(PxDiagnosticKind.host, "setupAnimationTriggers: No root element found for animation.");
+    return dispose;
   }
   let reversed = false;
   const start = () => {
@@ -6348,6 +7099,7 @@ function setupAnimationTriggers(api, config) {
         startHandler();
       } else {
         window.addEventListener("load", startHandler, { once: true });
+        cleanups.push(() => window.removeEventListener("load", startHandler));
       }
       break;
     }
@@ -6362,6 +7114,10 @@ function setupAnimationTriggers(api, config) {
       };
       root.addEventListener("mouseenter", mouseOverHandler);
       root.addEventListener("mouseleave", mouseOutHandler);
+      cleanups.push(() => {
+        root.removeEventListener("mouseenter", mouseOverHandler);
+        root.removeEventListener("mouseleave", mouseOutHandler);
+      });
       break;
     }
     case "click": {
@@ -6373,16 +7129,17 @@ function setupAnimationTriggers(api, config) {
         }
       };
       root.addEventListener("click", clickHandler);
+      cleanups.push(() => root.removeEventListener("click", clickHandler));
       break;
     }
     case "scrollIntoView": {
       const effectiveRatio = (entry) => {
-        var _a, _b;
+        var _a2, _b;
         const target = entry.boundingClientRect;
         const visible = entry.intersectionRect;
         if (!(target == null ? void 0 : target.height) || !visible) return entry.intersectionRatio;
         const live = typeof window !== "undefined" && window.innerHeight ? window.innerHeight : Infinity;
-        const declared = (_b = (_a = entry.rootBounds) == null ? void 0 : _a.height) != null ? _b : Infinity;
+        const declared = (_b = (_a2 = entry.rootBounds) == null ? void 0 : _a2.height) != null ? _b : Infinity;
         const viewport = Math.min(live, declared);
         const denom = Math.min(target.height, Number.isFinite(viewport) ? viewport : target.height);
         return denom > 0 ? visible.height / denom : entry.intersectionRatio;
@@ -6404,48 +7161,55 @@ function setupAnimationTriggers(api, config) {
         { threshold: thresholdSteps }
       );
       observer.observe(root);
+      cleanups.push(() => observer.disconnect());
       break;
     }
     case "programmatic":
       break;
   }
-  return api;
+  return dispose;
 }
 
-// src/PxAnimatorFrameLoop.ts
+// src/engines/PxAnimatorFrameLoop.ts
 function getSelector(id) {
   return "#" + id;
 }
 function createFrameLoopAnimator(doc, adapter, callbacks, rootElement) {
+  var _a2;
   const config = getAnimatorConfig(doc) || {};
+  const diag = createDiagnostics(callbacks, "[PxAnimator]");
   if (!rootElement) {
     if (doc.id) {
       const rootSelector = getSelector(doc.id);
       rootElement = document.querySelector(rootSelector);
-      if (!rootElement) console.warn("createFrameLoopAnimator: No root element found for selector: ", rootSelector);
+      if (!rootElement) diag.warn(PxDiagnosticKind.host, "createFrameLoopAnimator: No root element found for selector: " + rootSelector);
     } else {
-      console.warn("createFrameLoopAnimator: No root element provided");
+      diag.warn(PxDiagnosticKind.host, "createFrameLoopAnimator: No root element provided");
     }
   }
   const basicApi = createBasicFrameLoopAnimator(
     doc,
-    adapter || createDomAdapter(rootElement),
+    adapter || createDomAdapter(rootElement, diag),
     callbacks
   );
   const api = __spreadProps(__spreadValues({}, basicApi), {
     "getRootElement": () => rootElement || null
   });
-  if (config.trigger) {
-    if (isScrollTimeline(config)) {
-      console.warn("scroll timeline: `animator.trigger` is ignored (triggers do not apply to scroll-driven playback)");
-    } else {
-      setupAnimationTriggers(api, config.trigger);
-    }
+  if (isScrollTimeline(config)) {
+    if (config.trigger) diag.warn(PxDiagnosticKind.usage, "scroll timeline: `animator.trigger` is ignored (triggers do not apply to scroll-driven playback)");
+  } else {
+    const detachTriggers = setupAnimationTriggers(api, (_a2 = config.trigger) != null ? _a2 : {}, diag);
+    const destroyEngine = api.destroy.bind(api);
+    api.destroy = () => {
+      detachTriggers();
+      destroyEngine();
+    };
   }
   return api;
 }
-function createDomAdapter(rootElement) {
+function createDomAdapter(rootElement, diag) {
   const warnedSelectors = /* @__PURE__ */ new Set();
+  const report = diag != null ? diag : createDiagnostics(void 0, "[PxAnimator]");
   const adapter = {
     isConnected: () => {
       if (!rootElement) return true;
@@ -6457,7 +7221,7 @@ function createDomAdapter(rootElement) {
       const elements = (rootElement == null ? void 0 : rootElement.querySelectorAll(selector)) || document.querySelectorAll(selector);
       if (elements.length === 0 && !warnedSelectors.has(selector)) {
         warnedSelectors.add(selector);
-        console.warn('setAttribute: No elements found for selector "' + selector + '"');
+        report.warn(PxDiagnosticKind.host, 'setAttribute: No elements found for selector "' + selector + '"');
       }
       for (let i = 0; i < elements.length; i++) {
         const element = elements[i];
@@ -6472,18 +7236,17 @@ 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
   };
   let cssValue;
   let cssKey = propName;
-  if (COLOUR_ATTR_NAMES.has(propName) && Array.isArray(value)) {
+  if (COLOR_ATTR_NAMES.has(propName) && Array.isArray(value)) {
     cssValue = toRGBA(value);
   } else if (propName === "transform" && value !== null && typeof value === "object" && !Array.isArray(value)) {
     cssValue = composeTransformParts(value, { withUnits: true });
@@ -6510,11 +7273,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) {
@@ -6543,7 +7306,7 @@ 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;
@@ -6551,7 +7314,7 @@ function convertToWebApiKeyframes(animDef, unsupportedSet, config) {
     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 }));
@@ -6570,18 +7333,19 @@ function convertToWebApiKeyframes(animDef, unsupportedSet, config) {
   return result;
 }
 function createWebApiAnimator(doc, callbacks, rootElement, forceEvenIfHasUnsupportedAttrs, scrollTimeline) {
-  var _a;
+  var _a2, _b;
   const config = getAnimatorConfig(doc) || {};
+  const diag = createDiagnostics(callbacks, "[PxAnimator]");
   if (!rootElement) {
     if (doc.id) {
       const rootSelector = getSelector(doc.id);
       rootElement = document.querySelector(rootSelector);
-      if (!rootElement) console.warn("createFrameLoopAnimator: No root element found for selector: ", rootSelector);
+      if (!rootElement) diag.warn(PxDiagnosticKind.host, "createWebApiAnimator: No root element found for selector: " + rootSelector);
     } else {
-      console.warn("createFrameLoopAnimator: No root element provided");
+      diag.warn(PxDiagnosticKind.host, "createWebApiAnimator: No root element provided");
     }
   }
-  const bindings = getNormalisedBindings(doc, PxAnimatorEngine.waapi);
+  const bindings = getNormalizedBindings(doc, PxTimelineEngine.native);
   const animations = [];
   const _iterations = config.iterations;
   let iterations;
@@ -6591,18 +7355,18 @@ function createWebApiAnimator(doc, callbacks, rootElement, forceEvenIfHasUnsuppo
   let finishNotified = false;
   let removeCalled = false;
   if (!(bindings == null ? void 0 : bindings.length)) {
-    console.warn("createWebApiAnimator: No animation bindings defined");
+    diag.warn(PxDiagnosticKind.document, "createWebApiAnimator: No animation bindings defined");
   }
   for (const binding of bindings || []) {
     const animDef = binding.animate;
     if (!animDef || typeof animDef !== "object" || Array.isArray(animDef)) {
-      console.warn("createWebApiAnimator: Empty or unresolved binding", binding);
+      diag.warn(PxDiagnosticKind.document, "createWebApiAnimator: Empty or unresolved binding", binding);
       continue;
     }
     const selector = getSelector(binding.id);
     const elements = (rootElement == null ? void 0 : rootElement.querySelectorAll(selector)) || document.querySelectorAll(selector);
     if (elements.length === 0) {
-      console.warn('createWebApiAnimator: No elements found for selector "' + selector + '"');
+      diag.warn(PxDiagnosticKind.host, 'createWebApiAnimator: No elements found for selector "' + selector + '"');
     }
     const keyframesMap = convertToWebApiKeyframes(animDef, unsupportedSet, config);
     const positiveDelay = config.delay && config.delay > 0 ? config.delay : void 0;
@@ -6618,7 +7382,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
     };
@@ -6635,61 +7399,61 @@ 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;
             }
             animations.push(anim);
           } catch (e) {
-            console.warn(e);
+            diag.warn(PxDiagnosticKind.internal, "createWebApiAnimator: could not build the animation", e);
           }
         }
       }
     }
   }
   if (!forceEvenIfHasUnsupportedAttrs && unsupportedSet.size) {
-    console.warn("Unsupported CSS attrs: " + [...unsupportedSet].join(", "));
+    diag.warn(PxDiagnosticKind.platform, "Unsupported CSS attrs: " + [...unsupportedSet].join(", "));
     return null;
   }
   const api = {
     "isReady": () => true,
     "getRootElement": () => rootElement || null,
     "isPlaying": () => {
-      var _a2;
-      return ((_a2 = animations[0]) == null ? void 0 : _a2.playState) === "running";
+      var _a3;
+      return ((_a3 = animations[0]) == null ? void 0 : _a3.playState) === "running";
     },
     "play": () => {
-      var _a2;
+      var _a3;
       finishNotified = false;
       animations.forEach((a) => a.play());
-      (_a2 = callbacks == null ? void 0 : callbacks.onPlay) == null ? void 0 : _a2.call(callbacks);
+      (_a3 = callbacks == null ? void 0 : callbacks.onPlay) == null ? void 0 : _a3.call(callbacks);
     },
     "pause": () => {
-      var _a2;
+      var _a3;
       animations.forEach((a) => a.pause());
-      (_a2 = callbacks == null ? void 0 : callbacks.onPause) == null ? void 0 : _a2.call(callbacks);
+      (_a3 = callbacks == null ? void 0 : callbacks.onPause) == null ? void 0 : _a3.call(callbacks);
     },
     "cancel": () => {
-      var _a2;
+      var _a3;
       finishNotified = false;
       animations.forEach((a) => a.cancel());
-      (_a2 = callbacks == null ? void 0 : callbacks.onCancel) == null ? void 0 : _a2.call(callbacks);
+      (_a3 = callbacks == null ? void 0 : callbacks.onCancel) == null ? void 0 : _a3.call(callbacks);
     },
     "finish": () => {
-      var _a2;
+      var _a3;
       for (const a of animations) {
         try {
-          if (((_a2 = a.effect) == null ? void 0 : _a2.getTiming().iterations) === Infinity) {
+          if (((_a3 = a.effect) == null ? void 0 : _a3.getTiming().iterations) === Infinity) {
             a.effect.updateTiming({ iterations: 1 });
             a.finish();
             a.effect.updateTiming({ iterations: Infinity });
@@ -6702,36 +7466,55 @@ function createWebApiAnimator(doc, callbacks, rootElement, forceEvenIfHasUnsuppo
       }
     },
     "setPlaybackRate": (rate) => {
+      if (!isValidPlaybackRate(rate)) {
+        diag.warn(PxDiagnosticKind.usage, PX_RATE_REJECTED);
+        return api;
+      }
       animations.forEach((a) => a.playbackRate = rate);
       return api;
     },
     "getCurrentTime": () => {
-      var _a2, _b;
-      const res = (_b = (_a2 = animations[0]) == null ? void 0 : _a2.currentTime) != null ? _b : null;
+      var _a3, _b2;
+      const res = (_b2 = (_a3 = animations[0]) == null ? void 0 : _a3.currentTime) != null ? _b2 : null;
       return res !== null ? +res : null;
     },
     "setCurrentTime": (time) => {
+      var _a3;
+      const ceiling = seekCeilingMs((_a3 = config.duration) != null ? _a3 : 0, iterations != null ? iterations : 1);
+      const seek = ceiling > 0 ? clampSeekMs(time, ceiling) : Math.max(0, time);
       finishNotified = false;
       animations.forEach((a) => {
-        a.currentTime = time;
+        a.currentTime = seek;
       });
     },
+    "getCurrentProgress": () => {
+      var _a3;
+      const t = api.getCurrentTime();
+      return t === null ? null : timeToProgress(t, (_a3 = config.duration) != null ? _a3 : 0, iterations != null ? iterations : 1);
+    },
+    "setCurrentProgress": (progress) => {
+      var _a3;
+      api.setCurrentTime(progressToTimeMs(progress, (_a3 = config.duration) != null ? _a3 : 0, iterations != null ? iterations : 1));
+    },
     "destroy": () => {
-      var _a2;
+      var _a3;
       api.cancel();
       animations.splice(0, animations.length);
       if (!removeCalled) {
         removeCalled = true;
-        (_a2 = callbacks == null ? void 0 : callbacks.onRemove) == null ? void 0 : _a2.call(callbacks);
+        (_a3 = callbacks == null ? void 0 : callbacks.onRemove) == null ? void 0 : _a3.call(callbacks);
       }
     }
   };
-  if (config.trigger) {
-    if (config.timelineSource === "scroll") {
-      console.warn("scroll timeline: `animator.trigger` is ignored (triggers do not apply to scroll-driven playback)");
-    } else {
-      setupAnimationTriggers(api, config.trigger);
-    }
+  if (config.timelineSource === "scroll") {
+    if (config.trigger) diag.warn(PxDiagnosticKind.usage, "scroll timeline: `animator.trigger` is ignored (triggers do not apply to scroll-driven playback)");
+  } else {
+    const detachTriggers = setupAnimationTriggers(api, (_b = config.trigger) != null ? _b : {}, diag);
+    const destroyEngine = api.destroy.bind(api);
+    api.destroy = () => {
+      detachTriggers();
+      destroyEngine();
+    };
   }
   if (scrollTimeline) {
     animations.forEach((a) => a.play());
@@ -6739,21 +7522,22 @@ 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;
+function createNativeScrollTimeline(subject, config, diag) {
+  var _a2, _b, _c, _d;
+  const report = diag != null ? diag : createDiagnostics(void 0, "[PxAnimator]");
   if (!config || !isScrollTimeline(config)) return null;
   const scroll = config.scroll || {};
-  const kind = (_a = scroll.kind) != null ? _a : "view";
+  const kind = (_a2 = scroll.kind) != null ? _a2 : "view";
   if (scroll.smoothing) {
-    console.warn('scroll timeline: `smoothing` needs the built-in driver \u2014 ignoring `driver: "native"`');
+    report.warn(PxDiagnosticKind.platform, "scroll timeline: `smoothing` needs the built-in driver \u2014 using the built-in driver instead of the browser timeline");
     return null;
   }
   const g = globalThis;
@@ -6764,13 +7548,13 @@ function createNativeScrollTimeline(subject, config) {
   let timeline;
   try {
     if (view) {
-      timeline = new Ctor({ subject: resolveScrollSubject(subject, scroll.subject), axis });
+      timeline = new Ctor({ subject: resolveScrollSubject(subject, scroll.subject, report), axis });
     } else {
       const source = scroll.source === "root" ? documentScroller() : findNearestScroller(subject, "y") || findNearestScroller(subject, "x") || documentScroller();
       timeline = new Ctor({ source, axis });
     }
   } catch (e) {
-    console.warn("scroll timeline: native timeline construction failed \u2014 falling back to the custom driver", e);
+    report.warn(PxDiagnosticKind.platform, "scroll timeline: native timeline construction failed \u2014 falling back to the player measuring progress itself", e);
     return null;
   }
   return {
@@ -6797,8 +7581,9 @@ function documentScroller() {
 }
 var SUBJECT_PARENT = "parent";
 var SUBJECT_SCROLLER = "scroller";
-function resolveScrollSubject(svgRoot, subject) {
-  var _a, _b;
+function resolveScrollSubject(svgRoot, subject, diag) {
+  var _a2, _b;
+  const report = diag != null ? diag : createDiagnostics(void 0, "[PxAnimator]");
   const spec = subject == null ? void 0 : subject.trim();
   if (!spec) return svgRoot;
   if (spec === SUBJECT_PARENT) {
@@ -6807,7 +7592,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();
@@ -6816,21 +7601,22 @@ function resolveScrollSubject(svgRoot, subject) {
   try {
     found = document.querySelector(spec);
   } catch (e) {
-    console.warn('scroll timeline: subject "' + spec + '" is not a valid selector \u2014 measuring the SVG itself');
+    report.warn(PxDiagnosticKind.document, 'scroll timeline: subject "' + spec + '" is not a valid selector \u2014 measuring the SVG itself');
     return svgRoot;
   }
   if (!found) {
-    console.warn('scroll timeline: subject "' + spec + '" matched no element \u2014 measuring the SVG itself');
+    report.warn(PxDiagnosticKind.host, 'scroll timeline: subject "' + spec + '" matched no element \u2014 measuring the SVG itself');
     return svgRoot;
   }
   return found;
 }
-function createScrollDriver(subject, config, onProgress) {
-  var _a, _b;
+function createScrollDriver(subject, config, onProgress, diag) {
+  var _a2, _b;
   if (!config || !isScrollTimeline(config)) return null;
+  const report = diag != null ? diag : createDiagnostics(void 0, "[PxAnimator]");
   const scroll = config.scroll || {};
-  const kind = (_a = scroll.kind) != null ? _a : "view";
-  const measured = resolveScrollSubject(subject, scroll.subject);
+  const kind = (_a2 = scroll.kind) != null ? _a2 : "view";
+  const measured = resolveScrollSubject(subject, scroll.subject, report);
   const nearest = findNearestScroller(subject, "y") || findNearestScroller(subject, "x");
   const scroller = kind === "scroll" && scroll.source === "root" ? documentScroller() : nearest || documentScroller();
   const isRootScroller = scroller === documentScroller();
@@ -6948,8 +7734,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.pinOffset) != null ? _a2 : 0;
     if (!alignFactor) {
       style.top = extra + "px";
       return;
@@ -6989,42 +7775,43 @@ 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;
 }
 function bindWithEngineChoice(doc, adapter, callbacks, rootElement) {
   const animatorConfig = getAnimatorConfig(doc) || {};
+  const diag = createDiagnostics(callbacks, "[PxAnimator]");
   if (isScrollTimeline(animatorConfig)) {
     return finaliseAnimator(animatorConfig, callbacks, (cb) => {
-      var _a, _b;
+      var _a2;
       let unpin = () => {
       };
-      if (animatorConfig.mode !== PxAnimatorMode.frames && ((_a = animatorConfig.scroll) == null ? void 0 : _a.driver) === "native" && rootElement) {
+      if (mayUseNativeScrollTimeline(animatorConfig.engine) && rootElement) {
         unpin = applyScrollPin(rootElement, animatorConfig.scroll);
-        const native = createNativeScrollTimeline(rootElement, animatorConfig);
+        const native = createNativeScrollTimeline(rootElement, animatorConfig, diag);
         if (native) {
           const api2 = createWebApiAnimator(
             doc,
             cb,
             rootElement,
-            animatorConfig.mode === PxAnimatorMode.waapi,
+            isNativeForced(animatorConfig.engine),
             native
           );
           if (api2) {
@@ -7040,15 +7827,16 @@ 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);
         const driver = createScrollDriver(
           subject,
           animatorConfig,
-          (progress) => api.setCurrentTime(progress * totalMs)
+          (progress) => api.setCurrentTime(progress * totalMs),
+          diag
         );
         if (driver) {
           const destroy = api.destroy.bind(api);
@@ -7059,58 +7847,58 @@ function bindWithEngineChoice(doc, adapter, callbacks, rootElement) {
           };
         }
       } else {
-        console.warn("scroll timeline: no root element to observe \u2014 animation will stay at frame 0");
+        diag.warn(PxDiagnosticKind.host, "scroll timeline: no root element to observe \u2014 animation will stay at frame 0");
       }
       return api;
     });
   }
   return finaliseAnimator(animatorConfig, callbacks, (cb) => {
-    if (animatorConfig.mode === PxAnimatorMode.frames) {
+    if (animatorConfig.engine === PxTimelineEngineExtra.js) {
       return createFrameLoopAnimator(doc, adapter, cb, rootElement);
     }
     return createWebApiAnimator(
       doc,
       cb,
       rootElement,
-      animatorConfig.mode === PxAnimatorMode.waapi
-      // forcing waapi
+      isNativeForced(animatorConfig.engine)
     ) || createFrameLoopAnimator(doc, adapter, cb, rootElement);
   });
 }
 
-// src/PxAnimatorDOM.ts
+// src/dom/PxAnimatorDOM.ts
 var SVG_NS = "http://www.w3.org/2000/svg";
-function createElement(tagName, normalisedProps, style, children, textContent) {
+function createElement(tagName, normalizedProps, style, children, textContent, diag) {
   if (DISALLOWED_SVG_TAGS_LOWER.has(tagName.toLowerCase())) {
-    console.warn("SVG tag blocked (dangerous): ", tagName);
+    (diag != null ? diag : createDiagnostics(void 0, "[PxAnimator]")).warn(PxDiagnosticKind.document, "SVG tag blocked (dangerous): " + tagName);
     return null;
   }
   const element = document.createElementNS(SVG_NS, tagName);
-  for (const propName in normalisedProps) {
-    const sanitised = sanitiseAttributeValue(propName, normalisedProps[propName]);
-    if (sanitised === void 0) continue;
+  for (const propName in normalizedProps) {
+    const sanitized = sanitizeAttributeValue(propName, normalizedProps[propName]);
+    if (sanitized === void 0) continue;
     if (CSS_ONLY_STYLE_PROPS.has(propName)) {
-      element.style[propName] = String(sanitised);
+      element.style[propName] = String(sanitized);
       continue;
     }
-    element.setAttribute(camelCaseToKebabWordIfNeeded(propName), sanitised);
+    element.setAttribute(camelCaseToKebabWordIfNeeded(propName), sanitized);
   }
   if (style) {
     for (const styleProp in style) {
       element.style[styleProp] = String(style[styleProp]);
     }
   }
-  if (children) {
+  if (children == null ? void 0 : children.length) {
     for (const child of children) {
       element.appendChild(child);
     }
+  } else if (textContent) {
+    element.textContent = textContent;
   }
-  if (textContent) element.textContent = textContent;
   return element;
 }
-function renderNode(node, defs) {
+function renderNode(node, defs, diag) {
   if (!node) return null;
-  const _a = node, { type, children, style } = _a, props = __objRest(_a, ["type", "children", "style"]);
+  const _a2 = node, { type, children, style } = _a2, props = __objRest(_a2, ["type", "children", "style"]);
   const domType = props.domType;
   if (domType !== void 0) delete props.domType;
   const nodeDefs = getDefs(node) || defs;
@@ -7118,7 +7906,7 @@ function renderNode(node, defs) {
   let childElements;
   if (children) {
     for (const ch of children) {
-      const child = renderNode(ch, nodeDefs);
+      const child = renderNode(ch, nodeDefs, diag);
       if (child) {
         if (!childElements) childElements = [];
         childElements.push(child);
@@ -7130,31 +7918,39 @@ function renderNode(node, defs) {
     getNormalizedProps(props),
     resolvedStyle,
     childElements,
-    props[TEXT_CONTENT_ATTR] || props[TEXT_ATTR]
+    props[TEXT_CONTENT_ATTR],
+    diag
   );
   if (element && domType !== void 0) element.setAttribute("type", domType);
   return element;
 }
 
-// src/PxAnimatorKeys.ts
-var PX_ANIMATOR_DATA_KEY = "data";
+// src/shared/PxAnimatorKeys.ts
+var PX_ANIMATOR_DOC_KEY = "doc";
 
-// src/PxAnimator.ts
+// src/animator/PxAnimator.ts
 function createAnimatorFromConfig(doc, adapter, callbacks, rootElement) {
   return bindWithEngineChoice(doc, adapter, callbacks, rootElement);
 }
-function createAnimatorImpl(doc, adapter, callbacks, containerElement) {
+function createAnimatorImpl(doc, adapter, callbacks, containerElement, patch, resetTimeline) {
+  const diag = createDiagnostics(callbacks, "[PxAnimator]");
   const effectsWarnings = validateNodeEffects(doc);
-  for (const w of effectsWarnings) console.warn("[PxAnimator] effects shape warning:", w);
+  for (const w of effectsWarnings) diag.warn(PxDiagnosticKind.document, "effects shape: " + w);
+  reportDocumentDiagnostics(doc, "[PxAnimator] createAnimator");
+  if (patch !== void 0 || resetTimeline) {
+    const patched = applyAnimatorConfig(doc, patch != null ? patch : {}, { resetDefaults: !!resetTimeline });
+    for (const w of patched.warnings) diag.warn(PxDiagnosticKind.usage, "timeline override: " + w);
+    doc = patched.doc;
+  }
   const animatorConfig = getAnimatorConfig(doc) || {};
-  const engine = animatorConfig.mode === PxAnimatorMode.frames ? PxAnimatorEngine.frames : PxAnimatorEngine.waapi;
-  doc = materialiseAllInTree(doc, engine);
+  const engine = resolveTimelineEngine(animatorConfig.engine);
+  doc = materializeAllInTree(doc, engine);
   let rootElement = null;
   if (containerElement) {
     doc = generateNewIds(doc);
     const containerEl = typeof containerElement === "string" ? document.querySelector(containerElement) : containerElement;
     if (containerEl) {
-      rootElement = renderNode(doc);
+      rootElement = renderNode(doc, void 0, diag);
       if (rootElement) {
         containerEl.replaceChildren(rootElement);
       }
@@ -7171,16 +7967,22 @@ function createAnimatorImpl(doc, adapter, callbacks, containerElement) {
   }
   return api;
 }
+function resolveTimelineOption(options) {
+  const { timeline, duration, delay, iterations, startOn } = options;
+  return foldTimelineOverride(timeline, { duration, delay, iterations, startOn });
+}
 function createAnimator(options) {
-  const { src, data, adapter, callbacks, container } = options;
-  if (data !== void 0 && src !== void 0) {
-    throw new Error("createAnimator: provide either `src` or `data`, not both");
+  const { src, doc, adapter, container, resetTimeline } = options;
+  const patch = resolveTimelineOption(options);
+  const callbacks = toEngineCallbacks(options);
+  if (doc !== void 0 && src !== void 0) {
+    throw new Error("createAnimator: provide either `src` or `doc`, not both");
   }
-  if (data === void 0 && src === void 0) {
-    throw new Error("createAnimator: either `src` or `data` is required");
+  if (doc === void 0 && src === void 0) {
+    throw new Error("createAnimator: either `src` or `doc` is required");
   }
-  if (data !== void 0) {
-    return createAnimatorImpl(data, adapter, callbacks, container);
+  if (doc !== void 0) {
+    return createAnimatorImpl(doc, adapter, callbacks, container, patch, resetTimeline);
   }
   let animator = null;
   let pending = [];
@@ -7192,19 +7994,27 @@ function createAnimator(options) {
       pending.push(call);
     }
   };
+  const loadDiag = createDiagnostics(callbacks, "[PxAnimator]");
   fetch(src).then((res) => res.json()).then((json) => {
     if (destroyed) return;
     if (isPxElementFileFormat(json)) {
-      animator = createAnimatorImpl(json, adapter, callbacks, container);
+      animator = createAnimatorImpl(json, adapter, callbacks, container, patch, resetTimeline);
       const queued = pending;
       pending = null;
       queued == null ? void 0 : queued.forEach((call) => call(animator));
     } else {
-      console.error('createAnimator: invalid animation document format at "' + src + '"');
+      loadDiag.error(
+        PxDiagnosticKind.document,
+        'createAnimator: invalid animation document format at "' + src + '"'
+      );
     }
   }).catch((err) => {
+    var _a2;
     pending = null;
-    console.error('createAnimator: failed to load "' + src + '"', err);
+    loadDiag.error(
+      PxDiagnosticKind.host,
+      'createAnimator: failed to load "' + src + '" \u2014 ' + ((_a2 = err == null ? void 0 : err.message) != null ? _a2 : String(err))
+    );
   });
   return {
     "isReady": () => !!animator,
@@ -7229,6 +8039,10 @@ function createAnimator(options) {
     "setCurrentTime": (time) => {
       enqueue((api) => api.setCurrentTime(time));
     },
+    "getCurrentProgress": () => animator ? animator.getCurrentProgress() : null,
+    "setCurrentProgress": (progress) => {
+      enqueue((api) => api.setCurrentProgress(progress));
+    },
     "destroy": () => {
       destroyed = true;
       pending = null;
@@ -7236,83 +8050,119 @@ function createAnimator(options) {
     }
   };
 }
-function loadTagAnimators() {
+function loadTagAnimators(options) {
   const elements = document.querySelectorAll("[" + PX_ANIM_SRC_ATTR_NAME + "]");
   for (let i = 0; i < elements.length; i++) {
     const element = elements[i];
     if (!element[PX_ANIM_ATTR_NAME]) {
       const src = element.getAttribute(PX_ANIM_SRC_ATTR_NAME);
       if (src) {
-        element[PX_ANIM_ATTR_NAME] = createAnimator({ src, container: element });
+        element[PX_ANIM_ATTR_NAME] = createAnimator(__spreadProps(__spreadValues({}, options), { src, container: element }));
       }
     }
   }
 }
-if (typeof window !== "undefined") {
-  window["loadTagAnimators"] = loadTagAnimators;
-  window["createAnimator"] = createAnimator;
-  window["setupAnimationTriggers"] = setupAnimationTriggers;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  COLOUR_ATTR_NAMES,
+  BASELINE_PLAYER_VERSION,
+  COLOR_ATTR_NAMES,
+  DEFAULT_DURATION_MS,
   MISSING_GLYPH_CLASS_NAME,
-  PX_ANIMATOR_DATA_KEY,
+  PLAYER_WIRE_STEPS,
+  PLAYER_WIRE_VERSION,
+  PX_ANIMATOR_DOC_KEY,
   PX_ANIM_ATTR_NAME,
   PX_ANIM_SRC_ATTR_NAME,
+  PX_PLAYER_SCHEMA_VERSION,
   PX_TRANSFORM_PART_KEYS,
+  PX_TRIGGER_DEFAULTS,
+  PxAlongPathMode,
   PxAnimatedSvgDocumentSchema,
   PxAnimationDefinitionSchema,
   PxAnimatorConfigSchema,
-  PxAnimatorEngine,
-  PxAnimatorMode,
   PxAttrValueSchema,
   PxBezierPathSchema,
   PxBindingSchema,
+  PxClipPathEffectSchema,
   PxCloneEffectSchema,
+  PxCloneWithout,
+  PxControlMode,
   PxDefsSchema,
+  PxDiagnosticKind,
   PxEasingOrRefSchema,
   PxEffectsSchema,
   PxElementAnimationSchema,
   PxFillGradientEffectSchema,
+  PxFinishAction,
   PxGradientSpreadMethod,
   PxGradientStopSchema,
   PxGradientType,
-  PxGradientUnits,
   PxKeyframeSchema,
   PxKeyframeValueSchema,
+  PxLengthAdjust,
+  PxLoopDirection,
+  PxLoopRepeatAt,
   PxLoopSchema,
+  PxMaskType,
   PxMaskedByEffectSchema,
   PxNodeBase,
   PxNodeSchema,
+  PxPathOverflow,
+  PxPinAlign,
   PxPropertyAnimationSchema,
   PxRepeaterEffectSchema,
   PxRetimeEffectSchema,
+  PxScrollAxis,
+  PxScrollKind,
+  PxScrollPhase,
+  PxScrollRangePointSchema,
+  PxScrollRangeSchema,
+  PxScrollSchema,
+  PxScrollSource,
   PxStrokeGradientEffectSchema,
   PxStrokeTrimEffectSchema,
+  PxStrokeTrimSubPaths,
   PxSvgNodeExtra,
   PxTextEffectSchema,
   PxTextPathEffectSchema,
+  PxTextPathMethod,
+  PxTextPathSpacing,
+  PxTimelineEngine,
+  PxTimelineEngineExtra,
+  PxTimelinePinSchema,
+  PxTimelineSchema,
   PxTransformByEffectSchema,
   PxTransformPartsSchema,
   PxTransformValueSchema,
   PxTriggerSchema,
+  PxUnits,
   STYLE_ATTR_NAMES,
   TRANSFORM_FN_NAMES,
+  WIRE_VERSION_KEY,
+  WireStepKind,
+  WireVersionRelation,
+  applyAnimatorConfig,
   applyPlayerEffects,
   calcAnimationValues,
   camelCaseToKebabWordIfNeeded,
   collectSampleTimes,
+  compareWireVersion,
+  controlModeTakesOverTrigger,
+  convertPlayerDocument,
   createAnimator,
-  createAnimatorImpl,
   createBasicFrameLoopAnimator,
+  createDiagnostics,
   createFrameLoopAnimator,
   createPathSampler,
   createWebApiAnimator,
   describeSchema,
+  diagnoseDocument,
   diffInEffect,
+  downgradePlayerDocument,
   evaluateMotionPathSegment,
   extendedPathForBrowser,
+  foldTimelineOverride,
+  formatWireVersion,
   generateNewIds,
   getAnimatorConfig,
   getBindings,
@@ -7324,24 +8174,33 @@ if (typeof window !== "undefined") {
   jsonElementFactory,
   layoutGlyphTextChars,
   loadTagAnimators,
-  materialiseAllInTree,
-  materialiseAnimatedUseInstances,
-  materialiseGlyphText,
-  materialiseGlyphTextAlongPath,
-  materialiseGlyphTextHorizontal,
-  materialiseInternalLoopsInPropAnim,
-  materialiseInternalLoopsInTree,
-  materialiseMotionPathInPropAnim,
-  materialiseMotionPathsInTree,
+  materializeAllInTree,
+  materializeAnimatedUseInstances,
+  materializeGlyphText,
+  materializeGlyphTextAlongPath,
+  materializeGlyphTextHorizontal,
+  materializeInternalLoopsInPropAnim,
+  materializeInternalLoopsInTree,
+  materializeMotionPathInPropAnim,
+  materializeMotionPathsInTree,
+  mergeAnimatorConfig,
   normalizeDocument,
+  parseWireVersion,
+  progressToTimeMs,
   propAnimIsMotionPath,
   px,
+  readWireVersion,
   renderNode,
+  resolveControlMode,
+  resolveTrigger,
   schemaKeys,
   setupAnimationTriggers,
   shiftAnimatable,
+  timeToProgress,
   toRGBA,
+  validateDocument,
   validateNodeEffects,
+  versionAdvice,
   visualModelAt
 });
 //# sourceMappingURL=index.cjs.map