@pixodesk/svg-animator-web 1.0.34 → 1.0.35

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

@@ -54,16 +54,17 @@ var PixodeskAnimator = (() => {
     PX_ANIMATOR_DATA_KEY: () => PX_ANIMATOR_DATA_KEY,
     PX_ANIM_ATTR_NAME: () => PX_ANIM_ATTR_NAME,
     PX_ANIM_SRC_ATTR_NAME: () => PX_ANIM_SRC_ATTR_NAME,
-    PxAnimatorEngine: () => PxAnimatorEngine,
-    PxAnimatorMode: () => PxAnimatorMode,
+    PxTimelineEngine: () => PxTimelineEngine,
+    PxTimelineEngineExtra: () => PxTimelineEngineExtra,
     createAnimator: () => createAnimator,
     createAnimatorImpl: () => createAnimatorImpl,
     generateNewIds: () => generateNewIds,
     loadTagAnimators: () => loadTagAnimators,
-    setupAnimationTriggers: () => setupAnimationTriggers
+    setupAnimationTriggers: () => setupAnimationTriggers,
+    validateDocument: () => validateDocument
   });
 
-  // ../svg-animator-core/src/PxAnimatorUtil.ts
+  // ../svg-animator-core/src/util/PxAnimatorUtil.ts
   function bezierToSvgPath(path, forceCurves = false) {
     var _a, _b, _c, _d;
     const v = path.v;
@@ -511,7 +512,7 @@ var PixodeskAnimator = (() => {
     return cubicBezier(flipped);
   }
 
-  // ../svg-animator-core/src/PxScrollMath.ts
+  // ../svg-animator-core/src/playback/PxScrollMath.ts
   function isScrollTimeline(config) {
     return (config == null ? void 0 : config.timelineSource) === "scroll";
   }
@@ -567,7 +568,8 @@ var PixodeskAnimator = (() => {
     return vertical ? "x" : "y";
   }
 
-  // ../svg-animator-core/src/PxSchema.ts
+  // ../svg-animator-core/src/schema/PxSchema.ts
+  var PX_UNKNOWN_KEY_ERROR = "unexpected extra key";
   function pathStr(path) {
     if (!path.length) return ".";
     let result = "";
@@ -702,6 +704,7 @@ var PixodeskAnimator = (() => {
   };
   var DiscriminatedUnion = class extends Base {
     constructor(_key, _schemas, defaultVal) {
+      var _a;
       super();
       this._key = _key;
       this._schemas = _schemas;
@@ -711,13 +714,16 @@ var PixodeskAnimator = (() => {
       this._map = /* @__PURE__ */ new Map();
       for (const s of _schemas) {
         const keySchema = s._shape[_key];
-        if (keySchema) this._map.set(keySchema._default, s);
+        if (!keySchema) continue;
+        const literal = (_a = keySchema.inner) != null ? _a : 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) {
@@ -751,7 +757,8 @@ var PixodeskAnimator = (() => {
       const src = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
       const out = {};
       for (const key of Object.keys(this._shape)) {
-        out[key] = this._shape[key].sanitize(src[key]);
+        const v = this._shape[key].sanitize(src[key]);
+        if (v !== void 0) out[key] = v;
       }
       return out;
     }
@@ -773,7 +780,7 @@ var PixodeskAnimator = (() => {
           if (key in this._shape) continue;
           if (obj[key] === void 0) continue;
           p.push(key);
-          ctx.errors.push(pathStr(p) + ": unexpected extra key");
+          ctx.errors.push(pathStr(p) + ": " + PX_UNKNOWN_KEY_ERROR);
           p.pop();
           ok = false;
         }
@@ -797,7 +804,8 @@ var PixodeskAnimator = (() => {
       const src = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
       const out = __spreadValues({}, src);
       for (const key of Object.keys(this._shape)) {
-        out[key] = this._shape[key].sanitize(src[key]);
+        const v = this._shape[key].sanitize(src[key]);
+        if (v !== void 0) out[key] = v;
       }
       if (this._openSchema) {
         for (const key of Object.keys(src)) {
@@ -1038,25 +1046,40 @@ var PixodeskAnimator = (() => {
     lazy: (fn, defaultVal) => new Lazy(fn, defaultVal)
   };
 
-  // ../svg-animator-core/src/PxAnimatorConstants.ts
+  // ../svg-animator-core/src/format/PxAnimatorConstants.ts
   var PX_ANIM_SRC_ATTR_NAME = "data-px-animation-src";
   var PX_ANIM_ATTR_NAME = "_px_animator";
-  var PxAnimatorMode = {
-    auto: "auto",
-    waapi: "waapi",
-    frames: "frames"
+  var PX_TIMELINE_SHARED_KEYS = ["duration", "iterations", "engine", "frameRate"];
+  var PX_TIME_ONLY_TIMELINE_KEYS = ["trigger", "delay", "fillMode", "direction"];
+  var PxTimelineEngine = {
+    native: "native",
+    js: "js"
   };
-  var PxAnimatorEngine = {
-    waapi: PxAnimatorMode.waapi,
-    frames: PxAnimatorMode.frames
+  var PxTimelineEngineExtra = __spreadProps(__spreadValues({}, PxTimelineEngine), {
+    auto: "auto"
+  });
+  function resolveTimelineEngine(engine) {
+    return engine === PxTimelineEngineExtra.js ? PxTimelineEngine.js : PxTimelineEngine.native;
+  }
+  function isNativeForced(engine) {
+    return engine === PxTimelineEngineExtra.native;
+  }
+  function mayUseNativeScrollTimeline(engine) {
+    return engine !== PxTimelineEngineExtra.js;
+  }
+  var 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",
@@ -1066,8 +1089,9 @@ var PixodeskAnimator = (() => {
     userSpaceOnUse: "userSpaceOnUse",
     objectBoundingBox: "objectBoundingBox"
   };
-  var PxCloneType = {
-    content: "content"
+  var PxCloneWithout = {
+    translate: "translate"
+    // transform: 'transform',   // future: drop rotate/scale too (content only)
   };
   var PxPathOverflow = {
     clip: "clip",
@@ -1091,6 +1115,9 @@ var PixodeskAnimator = (() => {
   };
   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",
@@ -1101,6 +1128,18 @@ var PixodeskAnimator = (() => {
     TEXT_ATTR,
     TEXT_CONTENT_ATTR
   ]);
+  var TRANSFORM_PART = {
+    translate: "translate",
+    rotate: "rotate",
+    scale: "scale",
+    origin: "origin"
+  };
+  var PX_TRANSFORM_PART_KEYS = [
+    TRANSFORM_PART.translate,
+    TRANSFORM_PART.rotate,
+    TRANSFORM_PART.scale,
+    TRANSFORM_PART.origin
+  ];
   var PxGradientUnits = {
     userSpaceOnUse: "userSpaceOnUse",
     objectBoundingBox: "objectBoundingBox"
@@ -1118,7 +1157,7 @@ var PixodeskAnimator = (() => {
     if (!(fileJson && typeof fileJson === "object" && !Array.isArray(fileJson))) {
       return false;
     }
-    return fileJson["type"] === "svg";
+    return fileJson.type === "svg";
   }
   function getAnimatorConfig(doc) {
     var _a;
@@ -1132,13 +1171,14 @@ var PixodeskAnimator = (() => {
     const memoised = flattenMemo.get(cfg);
     if (memoised) return memoised;
     const _a = cfg, { timeline: _dropped } = _a, flat = __objRest(_a, ["timeline"]);
+    if (timeline.engine !== void 0) flat.engine = timeline.engine;
+    if (timeline.frameRate !== void 0) flat.frameRate = timeline.frameRate;
     if (timeline.type === "scroll" || timeline.type === "view") {
       flat.timelineSource = "scroll";
       if (timeline.duration !== void 0) flat.duration = timeline.duration;
       if (timeline.iterations !== void 0) flat.iterations = timeline.iterations;
       const scroll = __spreadValues({}, flat.scroll || {});
       scroll.kind = timeline.type;
-      if (timeline.engine !== void 0) scroll.driver = timeline.engine;
       if (timeline.axis !== void 0) scroll.axis = timeline.axis;
       if (timeline.source !== void 0) scroll.source = timeline.source;
       if (timeline.subject !== void 0) scroll.subject = timeline.subject;
@@ -1156,14 +1196,14 @@ var PixodeskAnimator = (() => {
     } else {
       if (timeline.duration !== void 0) flat.duration = timeline.duration;
       if (timeline.trigger !== void 0) {
-        const _b = timeline.trigger, { onFinish } = _b, restTrigger = __objRest(_b, ["onFinish"]);
+        const _b = timeline.trigger, { finishAction } = _b, restTrigger = __objRest(_b, ["finishAction"]);
         if (Object.keys(restTrigger).length) flat.trigger = restTrigger;
-        if (onFinish !== void 0) flat.resetOnFinish = onFinish === "reset";
+        if (finishAction !== void 0) flat.resetOnFinish = finishAction === "reset";
       }
       if (timeline.delay !== void 0) flat.delay = timeline.delay;
       if (timeline.iterations !== void 0) flat.iterations = timeline.iterations;
       if (timeline.direction !== void 0) flat.direction = timeline.direction;
-      if (timeline.fill !== void 0) flat.fill = timeline.fill;
+      if (timeline.fillMode !== void 0) flat.fill = timeline.fillMode;
     }
     flattenMemo.set(cfg, flat);
     return flat;
@@ -1181,7 +1221,7 @@ var PixodeskAnimator = (() => {
     return Object.entries(animateById).map(([id, anim]) => ({ id: id.startsWith("#") ? id.slice(1) : id, animate: anim }));
   }
 
-  // ../svg-animator-core/src/PxAnimatorTypes.ts
+  // ../svg-animator-core/src/format/PxAnimatorTypes.ts
   var PxEasingOrRefSchema = px.union([
     px.string(),
     px.tuple([px.number(), px.number(), px.number(), px.number()])
@@ -1213,16 +1253,32 @@ var PixodeskAnimator = (() => {
     // (review §1.3): editor data lives under `meta`. The editor still carries it on
     // its internal COPY-PASTE payload, which never validates against this schema.)
   }));
+  var anyKf = (kf) => kf;
+  var kfTime = (kf) => {
+    var _a, _b;
+    return (_b = (_a = anyKf(kf).time) != null ? _a : anyKf(kf).t) != null ? _b : 0;
+  };
+  var kfValue = (kf) => {
+    var _a;
+    return (_a = anyKf(kf).value) != null ? _a : anyKf(kf).v;
+  };
+  var kfEasing = (kf) => {
+    var _a;
+    return (_a = anyKf(kf).easing) != null ? _a : 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(["sampled", "offsetPath"]).optional()
   }));
   var PxTransformPartsSchema = implementsInterface()(px.object({
     translate: px.tuple([px.number(), px.number()]).optional(),
@@ -1249,10 +1305,9 @@ var PixodeskAnimator = (() => {
     startOn: px.enum(["load", "mouseOver", "click", "scrollIntoView", "programmatic"]).optional(),
     outAction: px.enum(["continue", "pause", "reset", "reverse"]).optional(),
     // What happens after a NATURAL finish — `'hold'` (default: keep the end state per
-    // `fill`) or `'reset'` (snap back to the start state). The trigger-vocabulary home of
-    // the old top-level `resetOnFinish: boolean` (read-legacy) — review §2.3: both
-    // "what happens at the end" knobs now sit side by side and share one style of value.
-    onFinish: px.enum(["hold", "reset"]).optional(),
+    // `fill`) or `'reset'` (snap back to the start state). Pairs with `outAction` ("what
+    // happens when the trigger condition ends"); both end-of-life knobs now read alike.
+    finishAction: px.enum(["hold", "reset"]).optional(),
     scrollIntoViewThreshold: px.number().optional()
   }));
   var PxGlyphSchema = implementsInterface()(px.object({
@@ -1272,7 +1327,7 @@ var PixodeskAnimator = (() => {
     // Review §2.6: the schema now matches the declared type — a style preset is a flat
     // record of string|number attribute values, nothing nested.
     styles: px.record(px.record(px.union([px.string(), px.number()]))).optional(),
-    glyphs: px.record(PxGlyphFontSchema).optional()
+    fonts: px.record(PxGlyphFontSchema).optional()
   }));
   var PX_SCROLL_PHASES = ["cover", "contain", "entry", "exit", "entry-crossing", "exit-crossing"];
   var PxScrollRangePointSchema = implementsInterface()(px.object({
@@ -1284,7 +1339,6 @@ var PixodeskAnimator = (() => {
     end: PxScrollRangePointSchema.optional()
   });
   var PxScrollSchema = implementsInterface()(px.object({
-    driver: px.enum(["custom", "native"]).optional(),
     kind: px.enum(["view", "scroll"]).optional(),
     axis: px.enum(["block", "inline", "x", "y"]).optional(),
     source: px.enum(["nearest", "root"]).optional(),
@@ -1297,21 +1351,26 @@ var PixodeskAnimator = (() => {
     pinDistance: px.number().optional(),
     range: PxScrollRangeSchema.optional()
   }));
-  var PxTimelinePinSchema = px.object({
+  var PxTimelinePinSchema = implementsInterface()(px.object({
     align: px.enum(["top", "center", "bottom"]).optional(),
     top: px.number().optional(),
     distance: px.number().optional()
-  });
-  var PxClockTimelineSchema = px.object({
-    type: px.literal("clock"),
+  }));
+  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(),
+    // `fillMode` on the wire (CSS `animation-fill-mode`; the runtime view calls it `fill`)
+    // — never `fill`, which is paint everywhere else in the format.
+    fillMode: px.enum(["forwards", "backwards", "both", "none"]).optional(),
     direction: px.enum(["normal", "reverse", "alternate", "alternate-reverse"]).optional()
-  });
+  }));
   var scrollishTimelineShape = {
     // §2.8: duration is a property of the TIMELINE — under scrubbing it is the keyframe
     // span the scroll range maps onto.
@@ -1319,7 +1378,8 @@ var PixodeskAnimator = (() => {
     // Finite repeat count IS meaningful when scrubbing — the scroll range maps onto
     // duration × iterations (rule D4; `'infinite'` cannot map to a range, so no literal here).
     iterations: px.number().optional(),
-    engine: px.enum(["custom", "native"]).optional(),
+    engine: PxTimelineEngineSchema,
+    frameRate: px.number().optional(),
     axis: px.enum(["block", "inline", "x", "y"]).optional(),
     source: px.enum(["nearest", "root"]).optional(),
     subject: px.string().optional(),
@@ -1329,23 +1389,29 @@ var PixodeskAnimator = (() => {
     pin: px.union([px.boolean(), PxTimelinePinSchema]).optional(),
     range: PxScrollRangeSchema.optional()
   };
-  var PxScrollTimelineSchema = px.object(__spreadValues({ type: px.literal("scroll") }, scrollishTimelineShape));
-  var PxViewTimelineSchema = px.object(__spreadValues({ type: px.literal("view") }, scrollishTimelineShape));
+  var PxScrollTimelineSchema = implementsInterface()(
+    px.object(__spreadValues({ type: px.literal("scroll") }, scrollishTimelineShape))
+  );
+  var PxViewTimelineSchema = implementsInterface()(
+    px.object(__spreadValues({ type: px.literal("view") }, scrollishTimelineShape))
+  );
   var PxTimelineSchema = px.discriminatedUnion("type", [
-    PxClockTimelineSchema,
+    PxTimeTimelineSchema,
+    // first = the member an absent `type` selects
     PxScrollTimelineSchema,
     PxViewTimelineSchema
   ]);
   var PxAnimatorConfigSchema = implementsInterface()(px.object({
-    mode: px.enum([PxAnimatorMode.auto, PxAnimatorMode.waapi, PxAnimatorMode.frames]).optional(),
-    // (`duration` lives INSIDE `timeline` on the wire — §2.8; the flat field below
-    // exists only on the runtime view, like the rest of the playback dynamics.)
-    frameRate: px.number().optional(),
+    // (`mode`, `duration` and `frameRate` live INSIDE `timeline` on the wire — §2.8; they exist
+    // at this level only on the runtime view, like the rest of the playback dynamics.)
     // THE spelling of "what advances progress" — clock / scroll / view (review §2.1).
     timeline: PxTimelineSchema.optional(),
     definitions: PxDefsSchema.optional(),
     animateById: px.record(PxElementAnimationSchema).optional(),
-    debugInstName: px.string().optional()
+    debugGlobalName: px.string().optional(),
+    // Declared HERE because this is a closed object: an undeclared key would be stripped by
+    // `sanitize` and flagged by strict validation on our own files.
+    version: px.string().optional()
   }));
   var PxBindingSchema = implementsInterface()(px.object({
     id: px.string(),
@@ -1394,7 +1460,7 @@ var PixodeskAnimator = (() => {
     origin: PxAnimatableVec2Schema.optional()
   }));
   var PxMaskedByEffectSchema = implementsInterface()(px.object({
-    sourceId: px.string().optional(),
+    source: px.string().optional(),
     maskType: px.enum([PxMaskType.luminance, PxMaskType.alpha]).optional(),
     maskUnits: px.enum([PxUnits.userSpaceOnUse, PxUnits.objectBoundingBox]).optional(),
     maskContentUnits: px.enum([PxUnits.userSpaceOnUse, PxUnits.objectBoundingBox]).optional(),
@@ -1417,9 +1483,10 @@ var PixodeskAnimator = (() => {
     timeCrop: px.tuple([px.number(), px.number()]).optional()
   }));
   var PxCloneEffectSchema = implementsInterface()(px.object({
-    // Contextual kind — the `type` convention, see `PxNodeBase.type`.
-    type: px.enum([PxCloneType.content]).optional(),
-    sourceId: px.string().optional(),
+    // Subtractive on purpose: the `<use>` can only point at one wrapper layer of the
+    // source, so the choices form a ladder — 'translate' now, maybe 'transform' later.
+    without: px.enum([PxCloneWithout.translate]).optional(),
+    source: px.string().optional(),
     retime: PxRetimeEffectSchema.optional()
   }));
   var PxGradientStopSchema = implementsInterface()(px.object({
@@ -1446,7 +1513,7 @@ var PixodeskAnimator = (() => {
   }));
   var PxStrokeGradientEffectSchema = PxFillGradientEffectSchema;
   var PxTextPathEffectSchema = implementsInterface()(px.object({
-    path: px.string(),
+    pathData: px.string(),
     pathOverflow: px.enum([PxPathOverflow.clip, PxPathOverflow.extend]).optional(),
     lengthAdjust: px.enum([PxLengthAdjust.spacing, PxLengthAdjust.spacingAndGlyphs]).optional(),
     method: px.enum([PxTextPathMethod.align, PxTextPathMethod.stretch]).optional(),
@@ -1486,16 +1553,33 @@ var PixodeskAnimator = (() => {
     walk(root, "root");
     return warnings;
   }
+  function validateDocument(doc) {
+    const ctx = { errors: [], warnings: [], strict: true };
+    const problems = PxAnimatedSvgDocumentSchema.isValid(doc, ctx, ["root"]) ? [] : [...ctx.errors];
+    if (doc && typeof doc === "object") {
+      for (const w of validateNodeEffects(doc, { strict: true })) {
+        if (!problems.includes(w)) problems.push(w);
+      }
+    }
+    return problems;
+  }
   var PxNodeBase = px.openObject({
     // CONVENTION (SCHEMA-DESIGN R1 / issues N4): `type` is the ONE word for "what
     // kind of thing is this", discriminated by its CARRIER — here the node TAG
-    // (`rect`, `text`), and inside a sub-object that object's kind (`clone.type`,
+    // (`rect`, `text`), and inside a sub-object that object's kind (`fillGradient.type`,
     // `fillGradient.type`, editor `preset.type`). Each sits in its own object, so
     // the carrier disambiguates completely; synonyms (`cloneKind`, `presetShape`)
     // would add words that all mean "type" and still need the carrier to read.
     // Guarding a `type` SLOT against a wrong VALUE is the job of strict enums
     // (issues V3), never of distinct key names.
     type: px.string(),
+    // The escape hatch for elements that carry a REAL `type` attribute — `<feTurbulence
+    // type="fractalNoise">`, `<feFuncR type="table">`, `<feColorMatrix type="saturate">`.
+    // `type` is taken by the tag name, so the attribute travels here and the renderer puts
+    // it back (`PxAnimatorDOM.renderNode`, `PxRnRender`). Declared here — not merely
+    // documented — because a wire key that is not in a schema is invisible to the
+    // minifier's reserve list and gets renamed (MINIFICATION-BOUNDARY-PLAN.md §1.1).
+    domType: px.string().optional(),
     id: px.string().optional(),
     meta: px.any().optional(),
     // Player-effects bucket emitted by the Editor's lightweight design format.
@@ -1531,7 +1615,7 @@ var PixodeskAnimator = (() => {
     c: px.boolean().optional()
   }));
 
-  // ../svg-animator-core/src/PxIdUtil.ts
+  // ../svg-animator-core/src/util/PxIdUtil.ts
   var _idCounter = 0;
   function generateUniqueId() {
     const timestamp = Date.now().toString(36);
@@ -1568,7 +1652,8 @@ var PixodeskAnimator = (() => {
       "flood-color",
       "lighting-color"
     ]);
-    const directIdRefAttrs = /* @__PURE__ */ new Set(["sourceId", "targetId", "boundElementId"]);
+    const directIdRefAttrs = /* @__PURE__ */ new Set(["targetId", "boundElementId"]);
+    const isEffectSourceRef = (key, parentKey) => key === "source" && (parentKey === "maskedBy" || parentKey === "clone");
     function collectIds(node) {
       if (!node || typeof node !== "object") return;
       if (node.id && typeof node.id === "string") {
@@ -1585,7 +1670,7 @@ var PixodeskAnimator = (() => {
         }
       }
     }
-    function updateRefs(node) {
+    function updateRefs(node, parentKey) {
       if (!node || typeof node !== "object") return;
       for (const [key, value] of Object.entries(node)) {
         if (key === "children") {
@@ -1605,7 +1690,7 @@ var PixodeskAnimator = (() => {
             }
           } else if (urlRefAttrs.has(key)) {
             node[key] = replaceUrlRefs(value, idMap);
-          } else if (directIdRefAttrs.has(key)) {
+          } else if (directIdRefAttrs.has(key) || isEffectSourceRef(key, parentKey)) {
             const hasHash = value.startsWith("#");
             const newId = idMap.get(hasHash ? value.slice(1) : value);
             if (newId) {
@@ -1621,7 +1706,7 @@ var PixodeskAnimator = (() => {
             }
           }
         } else if (typeof value === "object" && value !== null) {
-          updateRefs(value);
+          updateRefs(value, key);
         }
       }
     }
@@ -1647,7 +1732,7 @@ var PixodeskAnimator = (() => {
     });
   }
 
-  // ../svg-animator-core/src/PxNodeProps.ts
+  // ../svg-animator-core/src/util/PxNodeProps.ts
   var DISALLOWED_SVG_TAGS_LOWER = /* @__PURE__ */ new Set([
     "script",
     "foreignobject"
@@ -1729,14 +1814,14 @@ var PixodeskAnimator = (() => {
         propsCopy[key] = toRGBA(value);
       } else if (key === "transform" && value !== null && typeof value === "object" && !Array.isArray(value) && !value.keyframes) {
         const parts = value.value && typeof value.value === "object" ? value.value : value;
-        propsCopy["transform"] = composeTransformParts(parts, { withUnits: false });
+        propsCopy[TRANSFORM_ATTR] = composeTransformParts(parts, { withUnits: false });
       } else if (TRANSFORM_FN_NAMES.has(key)) {
         if (Array.isArray(value)) {
           if (key === "translate") value = value.map((v) => v + "px");
           value = value.join(",");
         }
         if (key === "rotate") value = value + "deg";
-        propsCopy["transform"] = key + "(" + value + ")";
+        propsCopy[TRANSFORM_ATTR] = key + "(" + value + ")";
       } else if (Array.isArray(value)) {
         propsCopy[key] = value.join(",");
       } else if (value !== void 0 && value !== null) {
@@ -1746,10 +1831,9 @@ var PixodeskAnimator = (() => {
     return propsCopy;
   }
 
-  // ../svg-animator-core/src/PxMotionPath.ts
+  // ../svg-animator-core/src/materialise/PxMotionPath.ts
   function getKfTranslate(kf) {
-    var _a;
-    const v = (_a = kf.value) != null ? _a : kf.v;
+    const v = kfValue(kf);
     if (!v) return void 0;
     if (Array.isArray(v) && v.length >= 2 && typeof v[0] === "number" && typeof v[1] === "number") {
       return [v[0], v[1]];
@@ -1759,31 +1843,27 @@ var PixodeskAnimator = (() => {
     return void 0;
   }
   function getKfTime(kf) {
-    var _a, _b;
-    return (_b = (_a = kf.time) != null ? _a : kf.t) != null ? _b : 0;
+    return kfTime(kf);
   }
   function getKfEasing(kf) {
-    var _a;
-    return (_a = kf.easing) != null ? _a : kf.e;
+    return kfEasing(kf);
   }
   function propAnimIsMotionPath(anim) {
-    var _a, _b;
     const kfs = anim.keyframes;
     if (!Array.isArray(kfs)) return false;
     if (anim.autoOrient) return true;
     for (const kf of kfs) {
-      if (((_a = kf.tangentIn) != null ? _a : kf.ti) || ((_b = kf.tangentOut) != null ? _b : kf.to)) return true;
+      if (kfTangentIn(kf) || kfTangentOut(kf)) return true;
     }
     return false;
   }
   var _segmentCache = /* @__PURE__ */ new WeakMap();
   function getSegmentCache(prevKf, nextKf, prevPos, nextPos) {
-    var _a, _b;
     let byNext = _segmentCache.get(prevKf);
     const existing = byNext == null ? void 0 : byNext.get(nextKf);
     if (existing) return existing;
-    const to = (_a = prevKf.tangentOut) != null ? _a : prevKf.to;
-    const ti = (_b = nextKf.tangentIn) != null ? _b : nextKf.ti;
+    const to = kfTangentOut(prevKf);
+    const ti = kfTangentIn(nextKf);
     const P1 = [prevPos[0] + (to ? to[0] : 0), prevPos[1] + (to ? to[1] : 0)];
     const P2 = [nextPos[0] + (ti ? ti[0] : 0), nextPos[1] + (ti ? ti[1] : 0)];
     const lut = bezier2D_arcLengthLUT(prevPos, P1, P2, nextPos);
@@ -1874,10 +1954,9 @@ var PixodeskAnimator = (() => {
     return result;
   }
   function unwrapAutoOrientRotations(kfs) {
-    var _a;
     let prev;
     for (const kf of kfs) {
-      const v = (_a = kf.v) != null ? _a : kf.value;
+      const v = kfValue(kf);
       if (!v || typeof v.rotate !== "number") continue;
       if (prev === void 0) {
         prev = v.rotate;
@@ -1894,8 +1973,7 @@ var PixodeskAnimator = (() => {
     return { t: time, v: value };
   }
   function getKfValueParts(kf) {
-    var _a;
-    const v = (_a = kf.value) != null ? _a : kf.v;
+    const v = kfValue(kf);
     if (!v || typeof v !== "object" || Array.isArray(v)) return void 0;
     return v;
   }
@@ -1956,9 +2034,8 @@ var PixodeskAnimator = (() => {
     return d;
   }
   function insertSharpCornerStepKfIfNeeded(out, prevKf, nextKf, prevPos, nextPos, rotationTol) {
-    var _a;
     const lastKf = out[out.length - 1];
-    const lastV = (_a = lastKf.v) != null ? _a : lastKf.value;
+    const lastV = kfValue(lastKf);
     const prevExit = lastV == null ? void 0 : lastV.rotate;
     if (typeof prevExit !== "number") return;
     const boundaryV = getKfValueParts(prevKf);
@@ -2139,7 +2216,7 @@ var PixodeskAnimator = (() => {
     return cloned;
   }
 
-  // ../svg-animator-core/src/PxDefinitions.ts
+  // ../svg-animator-core/src/animation/PxDefinitions.ts
   var LOOP_JUMP_SHIFT_MS = 1;
   function deepEqualValue(a, b) {
     if (a === b) return true;
@@ -2352,7 +2429,7 @@ var PixodeskAnimator = (() => {
     const totalIntervals = keyframes.length - 1;
     const segCount = clamp((_a = loop.segmentCount) != null ? _a : totalIntervals, 1, totalIntervals);
     let segKfs;
-    if (loop.extend === PxLoopExtend.before) {
+    if (loop.repeatAt === PxLoopRepeatAt.start) {
       segKfs = keyframes.slice(0, segCount + 1);
     } else {
       segKfs = keyframes.slice(totalIntervals - segCount);
@@ -2360,7 +2437,7 @@ var PixodeskAnimator = (() => {
     const firstT = (_b = keyframes[0].t) != null ? _b : 0;
     const lastT = (_c = keyframes[keyframes.length - 1].t) != null ? _c : 0;
     let fillStart, fillEnd;
-    if (loop.extend === PxLoopExtend.before) {
+    if (loop.repeatAt === PxLoopRepeatAt.start) {
       fillStart = 0;
       fillEnd = firstT;
     } else {
@@ -2373,21 +2450,18 @@ var PixodeskAnimator = (() => {
     const segEndT = (_e = segKfs[segKfs.length - 1].t) != null ? _e : 0;
     const segDuration = segEndT - segStartT;
     if (segDuration <= 0) return keyframes;
-    const template = segKfs.map((kf) => {
-      var _a2, _b2;
-      return {
-        relT: (kf.t - segStartT) / segDuration,
-        v: kf.v,
-        e: kf.e,
-        tangentIn: (_a2 = kf.tangentIn) != null ? _a2 : kf.ti,
-        tangentOut: (_b2 = kf.tangentOut) != null ? _b2 : kf.to
-      };
-    });
+    const template = segKfs.map((kf) => ({
+      relT: (kf.t - segStartT) / segDuration,
+      v: kf.v,
+      e: kf.e,
+      tangentIn: kfTangentIn(kf),
+      tangentOut: kfTangentOut(kf)
+    }));
     const fullReps = Math.floor(fillDuration / segDuration);
     const remainder = fillDuration - fullReps * segDuration;
     const partialFraction = remainder / segDuration;
     const looped = [];
-    const separateBoundary = loop.extend !== PxLoopExtend.before;
+    const separateBoundary = loop.repeatAt !== PxLoopRepeatAt.start;
     const originalTerminalKf = keyframes[keyframes.length - 1];
     let terminalEasingOverride;
     let hasTerminalEasingOverride = false;
@@ -2495,30 +2569,30 @@ var PixodeskAnimator = (() => {
         looped.push(pushed);
       }
     }
-    if (loop.extend === PxLoopExtend.before) {
+    if (loop.repeatAt === PxLoopRepeatAt.start) {
       if (partialFraction > 1e-9) {
-        const isReversed = !!loop.alternate && fullReps % 2 === 0;
+        const isReversed = loop.direction === PxLoopDirection.alternate && fullReps % 2 === 0;
         appendRepTail(fillStart, isReversed, partialFraction);
       }
       for (let rep = 0; rep < fullReps; rep++) {
         const distFromBoundary = fullReps - 1 - rep;
-        const isReversed = !!loop.alternate && distFromBoundary % 2 === 0;
+        const isReversed = loop.direction === PxLoopDirection.alternate && distFromBoundary % 2 === 0;
         const repStart = fillStart + remainder + rep * segDuration;
         appendRep(repStart, isReversed);
       }
     } else {
       for (let rep = 0; rep < fullReps; rep++) {
-        const isReversed = !!loop.alternate && rep % 2 === 0;
+        const isReversed = loop.direction === PxLoopDirection.alternate && rep % 2 === 0;
         const repStart = fillStart + rep * segDuration;
         appendRep(repStart, isReversed);
       }
       if (partialFraction > 1e-9) {
-        const isReversed = !!loop.alternate && fullReps % 2 === 0;
+        const isReversed = loop.direction === PxLoopDirection.alternate && fullReps % 2 === 0;
         const repStart = fillStart + fullReps * segDuration;
         appendRep(repStart, isReversed, partialFraction);
       }
     }
-    if (loop.extend === PxLoopExtend.before) {
+    if (loop.repeatAt === PxLoopRepeatAt.start) {
       return [...looped, ...keyframes];
     } else {
       if (hasTerminalEasingOverride && keyframes.length > 0) {
@@ -2530,34 +2604,34 @@ var PixodeskAnimator = (() => {
     }
   }
   function normalizeKeyframes(propName, propAnim, duration, defs) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a;
     const keyframes = propAnim.keyframes || [];
     const normalized = [];
     for (const kf of keyframes) {
-      const timePct = (_b = (_a = kf.time) != null ? _a : kf.t) != null ? _b : 0;
-      let value = (_c = kf.value) != null ? _c : kf.v;
-      const easing = (_d = kf.easing) != null ? _d : kf.e;
+      const timePct = kfTime(kf);
+      let value = kfValue(kf);
+      const easing = kfEasing(kf);
       if (propName === "d") {
         value = normalizePathValue(value);
       }
       const propNameKebab = isCamelCaseWord(propName) ? camelCaseToKebabWordIfNeeded(propName) : propName;
       if (COLOUR_ATTR_NAMES.has(propNameKebab)) {
-        value = (_e = parseColor(value)) != null ? _e : value;
+        value = (_a = parseColor(value)) != null ? _a : 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 _a2, _b;
+      return ((_a2 = a.t) != null ? _a2 : 0) - ((_b = b.t) != null ? _b : 0);
     });
     const loopRaw = propAnim.loop;
     const loop = loopRaw === true ? {} : loopRaw || void 0;
@@ -2584,15 +2658,17 @@ var PixodeskAnimator = (() => {
     const propNameKebab = isCamelCaseWord(propName) ? camelCaseToKebabWordIfNeeded(propName) : propName;
     const isColour = COLOUR_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 _a;
+      const t = kfTime(kf);
+      let v = kfValue(kf);
       if (propName === "d") v = normalizePathValue(v);
-      if (isColour) v = (_c = parseColor(v)) != null ? _c : v;
-      const e = (_d = kf.e) != null ? _d : kf.easing;
+      if (isColour) v = (_a = parseColor(v)) != null ? _a : 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);
@@ -2643,7 +2719,7 @@ var PixodeskAnimator = (() => {
     const staticParts = staticTransform && typeof staticTransform === "object" && !Array.isArray(staticTransform) ? staticTransform : parseTransformParts(staticTransform);
     if (!staticParts || !Object.keys(staticParts).length) return animDef;
     const mergeKfValue = (v) => v && typeof v === "object" && !Array.isArray(v) ? __spreadValues(__spreadValues({}, staticParts), v) : v;
-    const transformAnim = animDef["transform"];
+    const transformAnim = animDef[TRANSFORM_ATTR];
     if (transformAnim && typeof transformAnim === "object") {
       const anim = transformAnim;
       if (Array.isArray(anim.keyframes)) {
@@ -2668,7 +2744,7 @@ var PixodeskAnimator = (() => {
     delete rest[ch];
     return __spreadProps(__spreadValues({}, rest), { transform: lifted });
   }
-  function normalizeAnimationDefinition(animDef, duration, defs, engine = PxAnimatorEngine.waapi) {
+  function normalizeAnimationDefinition(animDef, duration, defs, engine = PxTimelineEngine.native) {
     const normalized = {};
     for (const [propName, propAnim] of Object.entries(animDef)) {
       if (propName === "transform" && propAnim.alongPathMode === "offsetPath" && animDef["offsetDistance"] !== void 0) {
@@ -2679,12 +2755,12 @@ var PixodeskAnimator = (() => {
         const out = { keyframes: normalizedKfs };
         if (propAnim.autoOrient !== void 0) out.autoOrient = propAnim.autoOrient;
         if (propAnim.loop !== void 0) out.loop = propAnim.loop;
-        normalized[propName] = engine === PxAnimatorEngine.waapi && propName === "transform" ? materialiseMotionPathInPropAnim(out) : out;
+        normalized[propName] = engine === PxTimelineEngine.native && propName === "transform" ? materialiseMotionPathInPropAnim(out) : out;
       }
     }
     return normalized;
   }
-  function getNormalisedBindings(doc, engine = PxAnimatorEngine.waapi) {
+  function getNormalisedBindings(doc, engine = PxTimelineEngine.native) {
     const animatorConfig = getAnimatorConfig(doc) || {};
     const defs = getDefs(doc);
     const duration = animatorConfig.duration || 1e3;
@@ -2750,13 +2826,13 @@ var PixodeskAnimator = (() => {
     return { prevKf, nextKf };
   }
   function calcPropertyValue(propName, propAnim, progress) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _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);
     localProgress = clamp(localProgress, 0, 1);
-    const easing = (_c = prevKf.e) != null ? _c : prevKf.easing;
+    const easing = kfEasing(prevKf);
     if (easing && Array.isArray(easing)) {
       try {
         localProgress = cubicBezier(easing)(localProgress);
@@ -2765,11 +2841,11 @@ var PixodeskAnimator = (() => {
     }
     let cssAttrName = isCamelCaseWord(propName) ? camelCaseToKebabWordIfNeeded(propName) : propName;
     let cssValue = null;
-    const prevV = (_d = prevKf == null ? void 0 : prevKf.v) != null ? _d : prevKf == null ? void 0 : prevKf.value;
-    const nextV = (_e = nextKf == null ? void 0 : nextKf.v) != null ? _e : nextKf == null ? void 0 : nextKf.value;
+    const prevV = prevKf == null ? void 0 : prevKf.v;
+    const nextV = nextKf == null ? void 0 : nextKf.v;
     if (cssAttrName === "d") {
-      const prevPaths = (_f = prevV == null ? void 0 : prevV.paths) != null ? _f : Array.isArray(prevV) ? prevV : [];
-      const nextPaths = (_g = nextV == null ? void 0 : nextV.paths) != null ? _g : Array.isArray(nextV) ? nextV : [];
+      const prevPaths = (_c = prevV == null ? void 0 : prevV.paths) != null ? _c : Array.isArray(prevV) ? prevV : [];
+      const nextPaths = (_d = nextV == null ? void 0 : nextV.paths) != null ? _d : Array.isArray(nextV) ? nextV : [];
       cssValue = interpolateBeziers(
         prevPaths,
         nextPaths,
@@ -2872,7 +2948,7 @@ var PixodeskAnimator = (() => {
     return result;
   }
 
-  // ../svg-animator-core/src/PxNodeCloneUtil.ts
+  // ../svg-animator-core/src/util/PxNodeCloneUtil.ts
   function deepClonePxNode(value) {
     if (value === null || typeof value !== "object") return value;
     if (Array.isArray(value)) return value.map(deepClonePxNode);
@@ -2936,7 +3012,7 @@ var PixodeskAnimator = (() => {
     return gNode;
   }
 
-  // ../svg-animator-core/src/PxAnimatorUseMaterialiser.ts
+  // ../svg-animator-core/src/materialise/PxAnimatorUseMaterialiser.ts
   function materialiseAnimatedUseInstances(root) {
     var _a;
     const idMap = buildIdMap(root);
@@ -3084,7 +3160,7 @@ var PixodeskAnimator = (() => {
     return changed ? __spreadProps(__spreadValues({}, node), { children: newChildren }) : node;
   }
 
-  // ../svg-animator-core/src/effects/transformParts.ts
+  // ../svg-animator-core/src/effects/shared/transformParts.ts
   function partsRecord(part, value, origin) {
     const rec = {};
     if (part === "translate" /* Translate */) rec.translate = value;
@@ -3095,19 +3171,19 @@ var PixodeskAnimator = (() => {
     return rec;
   }
   function readAnimatable(raw) {
-    var _a, _b, _c;
+    var _a, _b;
     if (raw === void 0) return { kind: "absent" /* Absent */ };
     if (Array.isArray(raw)) return { kind: "static" /* Static */, value: raw };
     if (typeof raw === "object") {
       const obj = raw;
-      const kfs = (_a = obj.keyframes) != null ? _a : obj.kfs;
+      const kfs = obj.keyframes;
       if (kfs) {
         const out = { kind: "animated" /* Animated */, keyframes: kfs.map(normaliseKeyframe), autoOrient: obj.autoOrient, loop: obj.loop };
-        const base = (_b = obj.value) != null ? _b : obj.v;
+        const base = (_a = obj.value) != null ? _a : obj.v;
         if (base !== void 0 && out.kind === "animated" /* Animated */) out.base = base;
         return out;
       }
-      const staticValue = (_c = obj.value) != null ? _c : obj.v;
+      const staticValue = (_b = obj.value) != null ? _b : obj.v;
       if (staticValue !== void 0) return { kind: "static" /* Static */, value: staticValue };
     }
     return { kind: "static" /* Static */, value: raw };
@@ -3161,7 +3237,7 @@ var PixodeskAnimator = (() => {
     return out;
   }
 
-  // ../svg-animator-core/src/effects/transformationEffect.ts
+  // ../svg-animator-core/src/effects/transform/transformationEffect.ts
   function applyTransformByEffect(node, fx, ctx) {
     if (!fx) return node;
     delete node.transform;
@@ -3252,7 +3328,7 @@ var PixodeskAnimator = (() => {
     return inner;
   }
 
-  // ../svg-animator-core/src/effects/util.ts
+  // ../svg-animator-core/src/effects/shared/util.ts
   function genId(ctx, prefix) {
     return "_lw_" + prefix + "_" + ctx.nextId++;
   }
@@ -3274,11 +3350,11 @@ var PixodeskAnimator = (() => {
     return regenerateIdsAndRewriteRefs(root, () => genId(ctx, "retimed"));
   }
 
-  // ../svg-animator-core/src/effects/contentRefSplit.ts
+  // ../svg-animator-core/src/effects/reference/contentRefSplit.ts
   function identifyContentRefTargets(node, ctx, allocator) {
     var _a, _b, _c;
-    if (node.type === "use" && ((_b = (_a = node.effects) == null ? void 0 : _a.clone) == null ? void 0 : _b.type) === "content") {
-      const sourceId = stripHash2(node.effects.clone.sourceId);
+    if (node.type === "use" && ((_b = (_a = node.effects) == null ? void 0 : _a.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));
       }
@@ -3489,7 +3565,7 @@ var PixodeskAnimator = (() => {
     return false;
   }
 
-  // ../svg-animator-core/src/effects/gradientEffect.ts
+  // ../svg-animator-core/src/effects/paint/gradientEffect.ts
   function applyFillGradientEffect(node, fx, ctx) {
     return applyGradient(node, fx, ctx, "fill");
   }
@@ -3559,7 +3635,7 @@ var PixodeskAnimator = (() => {
     writeAnimatableChannel(out, attrName, read, { asString: true });
   }
   function buildStopChildren(stops, ctx) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     if (!stops) return [];
     const read = readAnimatable(stops);
     if (read.kind === "absent" /* Absent */) return [];
@@ -3569,14 +3645,14 @@ var PixodeskAnimator = (() => {
     const loopFromSource = read.loop;
     let stopCount = 0;
     for (const kf of kfs) {
-      const v = (_a = kf.value) != null ? _a : kf.v;
+      const v = kfValue(kf);
       if (Array.isArray(v) && v.length > stopCount) stopCount = v.length;
     }
     if (!stopCount) return [];
-    const firstKfValue = (_b = kfs[0].value) != null ? _b : kfs[0].v;
+    const firstKfValue = kfValue(kfs[0]);
     const baselineStops = [];
     for (let i = 0; i < stopCount; i++) {
-      const s = (_d = (_c = firstKfValue == null ? void 0 : firstKfValue[i]) != null ? _c : prevDefinedStop(kfs, 0, i)) != null ? _d : { offset: i / Math.max(1, stopCount - 1), color: "#000000" };
+      const s = (_b = (_a = firstKfValue == null ? void 0 : firstKfValue[i]) != null ? _a : prevDefinedStop(kfs, 0, i)) != null ? _b : { offset: i / Math.max(1, stopCount - 1), color: "#000000" };
       baselineStops.push({ offset: s.offset, color: s.color });
     }
     return baselineStops.map((bs, i) => animatedStopNode(bs, kfs, i, ctx, loopFromSource));
@@ -3589,16 +3665,16 @@ var PixodeskAnimator = (() => {
     };
   }
   function animatedStopNode(baseline, kfs, stopIdx, _ctx, loop) {
-    var _a, _b, _c, _d, _e;
+    var _a;
     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 = (_a = arr == null ? void 0 : arr[stopIdx]) != null ? _a : prevDefinedStop(kfs, kfs.indexOf(kf), stopIdx);
       if (!sliced) continue;
-      const easing = (_e = kf.easing) != null ? _e : kf.e;
+      const easing = kfEasing(kf);
       const colorOut = { time: t, value: sliced.color };
       if (easing !== void 0) colorOut.easing = easing;
       colorKfs.push(colorOut);
@@ -3625,13 +3701,12 @@ var PixodeskAnimator = (() => {
     return stop;
   }
   function prevDefinedStop(kfs, fromIdx, stopIdx) {
-    var _a, _b;
     for (let i = fromIdx; i >= 0; i--) {
-      const arr = (_a = kfs[i].value) != null ? _a : kfs[i].v;
+      const arr = kfValue(kfs[i]);
       if (arr == null ? void 0 : arr[stopIdx]) return arr[stopIdx];
     }
     for (let i = fromIdx + 1; i < kfs.length; i++) {
-      const arr = (_b = kfs[i].value) != null ? _b : kfs[i].v;
+      const arr = kfValue(kfs[i]);
       if (arr == null ? void 0 : arr[stopIdx]) return arr[stopIdx];
     }
     return void 0;
@@ -3641,7 +3716,7 @@ var PixodeskAnimator = (() => {
     return pct + "%";
   }
 
-  // ../svg-animator-core/src/effects/clipPathEffect.ts
+  // ../svg-animator-core/src/effects/clipping/clipPathEffect.ts
   function applyClipPathEffect(node, fx, ctx) {
     if (!(fx == null ? void 0 : fx.d)) return node;
     const clipId = genId(ctx, "clip");
@@ -3665,12 +3740,12 @@ var PixodeskAnimator = (() => {
     return void 0;
   }
 
-  // ../svg-animator-core/src/effects/maskedByEffect.ts
+  // ../svg-animator-core/src/effects/clipping/maskedByEffect.ts
   function applyMaskedByEffect(node, fx, transformBy, ctx) {
     if (!fx) return node;
-    const sourceId = stripHash2(fx.sourceId);
+    const sourceId = stripHash2(fx.source);
     if (!sourceId) {
-      ctx.errors.push("maskedBy.sourceId missing \u2014 cannot build mask");
+      ctx.errors.push("maskedBy.source missing \u2014 cannot build mask");
       return node;
     }
     const maskId = genId(ctx, "mask");
@@ -3945,7 +4020,7 @@ var PixodeskAnimator = (() => {
     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);
+      const maskSourceId = stripHash2((_b = (_a = n.effects) == null ? void 0 : _a.maskedBy) == null ? void 0 : _b.source);
       if (typeof maskSourceId === "string") {
         interestingNodes.add(n);
         const sourceNode = ctx.idMap.get(maskSourceId);
@@ -3974,7 +4049,7 @@ var PixodeskAnimator = (() => {
     if (typeof tr === "string") {
       const parts = parseTranslateOnlyFromString(tr, ctx);
       if (parts) out.translate = parts;
-    } else if (tr && typeof tr === "object" && !tr.keyframes && !tr.kfs) {
+    } else if (tr && typeof tr === "object" && !tr.keyframes) {
       const wrapped = tr.value;
       const value = wrapped && typeof wrapped === "object" ? wrapped : tr;
       if (value && typeof value === "object" && Array.isArray(value.translate)) {
@@ -4022,16 +4097,15 @@ var PixodeskAnimator = (() => {
     return seen ? [x, y] : void 0;
   }
 
-  // ../svg-animator-core/src/effects/refEffect.ts
-  var CONTENT_SUBREF = "content";
+  // ../svg-animator-core/src/effects/reference/refEffect.ts
   function applyRefHref(node, clone2, ctx) {
     if (!clone2) return;
-    const sourceId = stripHash2(clone2.sourceId);
+    const sourceId = stripHash2(clone2.source);
     if (!sourceId) {
-      if (clone2.type === CONTENT_SUBREF) ctx.errors.push("clone: content ref missing sourceId");
+      if (clone2.without === PxCloneWithout.translate) ctx.errors.push("clone: content ref missing `source`");
       return;
     }
-    const targetId = clone2.type === CONTENT_SUBREF ? ctx.contentRefInnerIds.get(sourceId) || sourceId : sourceId;
+    const targetId = clone2.without === PxCloneWithout.translate ? ctx.contentRefInnerIds.get(sourceId) || sourceId : sourceId;
     node.href = "#" + targetId;
   }
   function applyRefAndTransformationEffect(node, clone2, transformBy, ctx) {
@@ -4039,7 +4113,7 @@ var PixodeskAnimator = (() => {
     return applyTransformByEffect(node, transformBy, ctx);
   }
 
-  // ../svg-animator-core/src/effects/repeaterEffect.ts
+  // ../svg-animator-core/src/effects/transform/repeaterEffect.ts
   function applyRepeaterEffect(node, fx, ctx) {
     var _a, _b;
     if (!fx) return node;
@@ -4110,7 +4184,7 @@ var PixodeskAnimator = (() => {
     return mapAnimatable(raw, scalePower, true);
   }
 
-  // ../svg-animator-core/src/effects/retimeEffect.ts
+  // ../svg-animator-core/src/effects/reference/retimeEffect.ts
   var RETIME_MATERIALISATION_MODE_INLINE_G = false;
   function asRetime(r) {
     var _a, _b;
@@ -4293,7 +4367,7 @@ var PixodeskAnimator = (() => {
     }
   }
 
-  // ../svg-animator-core/src/effects/pathSampler.ts
+  // ../svg-animator-core/src/effects/text/pathSampler.ts
   var LUT_STEPS = 48;
   var CMD_RE = /[MmLlHhVvCcSsQqTtAaZz]/;
   function tokenize(d) {
@@ -4441,7 +4515,7 @@ var PixodeskAnimator = (() => {
     };
   }
 
-  // ../svg-animator-core/src/effects/textPathEffect.ts
+  // ../svg-animator-core/src/effects/text/textPathEffect.ts
   var EXTEND_MARGIN_FRAC = 0.15;
   function numRange(v) {
     const read = readAnimatable(v);
@@ -4509,9 +4583,9 @@ var PixodeskAnimator = (() => {
   }
   function applyTextPathEffect(node, fx, ctx) {
     var _a;
-    if (!fx || typeof fx.path !== "string" || !fx.path) return node;
+    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,
@@ -4536,7 +4610,7 @@ var PixodeskAnimator = (() => {
     writeAnimatableChannel(node, attrName, readAnimatable(raw), { asString: true });
   }
 
-  // ../svg-animator-core/src/effects/elementFactory.ts
+  // ../svg-animator-core/src/effects/text/elementFactory.ts
   var jsonElementFactory = (type, props, children) => {
     const node = { type };
     for (const k in props) if (props[k] !== void 0) node[k] = props[k];
@@ -4545,7 +4619,7 @@ var PixodeskAnimator = (() => {
     return node;
   };
 
-  // ../svg-animator-core/src/effects/glyphPathBake.ts
+  // ../svg-animator-core/src/effects/text/glyphPathBake.ts
   function fmt(v, decimals) {
     return Math.round(v) === v ? "" + Math.round(v) : v.toFixed(decimals);
   }
@@ -4591,7 +4665,7 @@ var PixodeskAnimator = (() => {
     return out;
   }
 
-  // ../svg-animator-core/src/effects/textGlyphsEffect.ts
+  // ../svg-animator-core/src/effects/text/textGlyphsEffect.ts
   var DEFAULT_FONT_SIZE = 16;
   var TEXT_ATTR_KEYS = [
     "fontFamily",
@@ -4970,7 +5044,7 @@ var PixodeskAnimator = (() => {
     return p;
   }
   function missingGlyphProps(isMissing) {
-    return isMissing ? { class: MISSING_GLYPH_CLASS_NAME } : {};
+    return isMissing ? { [CLASS_ATTR]: MISSING_GLYPH_CLASS_NAME } : {};
   }
   function buildPaths(placements, create, warnings) {
     if (!placements.length) {
@@ -5010,20 +5084,20 @@ var PixodeskAnimator = (() => {
   function applyTextGlyphsEffect(node, fx, ctx) {
     if (!(fx == null ? void 0 : fx.useGlyphs)) return node;
     if (!ctx.glyphs) {
-      ctx.warnings.push("textGlyphs: no definitions.glyphs \u2014 left as native <text>");
+      ctx.warnings.push("textGlyphs: no definitions.fonts \u2014 left as native <text>");
       return node;
     }
     return materialiseGlyphTextHorizontal(node, { glyphs: ctx.glyphs, warnings: ctx.warnings });
   }
   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);
   }
 
-  // ../svg-animator-core/src/effects/strokeTrimEffect.ts
+  // ../svg-animator-core/src/effects/stroke/strokeTrimEffect.ts
   function applyStrokeTrimEffect(node, strokeTrim, ctx) {
     if (!strokeTrim) return node;
     const combined = strokeTrim.subPaths === PxStrokeTrimSubPaths.combined;
@@ -5159,12 +5233,11 @@ var PixodeskAnimator = (() => {
     ];
   }
   function readScalarValues(r) {
-    var _a;
     if (r.kind === "absent" /* Absent */) return [];
     if (r.kind === "static" /* Static */) return [r.value];
     const out = [];
     for (const kf of r.keyframes) {
-      const v = (_a = kf.value) != null ? _a : kf.v;
+      const v = kfValue(kf);
       if (typeof v === "number") out.push(v);
     }
     return out;
@@ -5174,14 +5247,11 @@ var PixodeskAnimator = (() => {
     if (read.kind === "static" /* Static */) return { kind: "static" /* Static */, value: map(read.value) };
     return {
       kind: "animated" /* Animated */,
-      keyframes: read.keyframes.map((kf) => {
-        var _a, _b, _c, _d;
-        return {
-          time: (_b = (_a = kf.time) != null ? _a : kf.t) != null ? _b : 0,
-          value: map((_c = kf.value) != null ? _c : kf.v),
-          easing: (_d = kf.easing) != null ? _d : kf.e
-        };
-      }),
+      keyframes: read.keyframes.map((kf) => ({
+        time: kfTime(kf),
+        value: map(kfValue(kf)),
+        easing: kfEasing(kf)
+      })),
       loop: read.loop
     };
   }
@@ -5191,7 +5261,6 @@ var PixodeskAnimator = (() => {
   }
   var OPACITY_STEP_MS = 10;
   function computeOpacityFromRange(rangeRead) {
-    var _a, _b, _c, _d, _e, _f;
     const hide = (v) => v[0] === v[1];
     if (rangeRead.kind === "absent" /* Absent */) return void 0;
     if (rangeRead.kind === "static" /* Static */) return hide(rangeRead.value) ? { kind: "static" /* Static */, value: 0 } : void 0;
@@ -5199,7 +5268,7 @@ var PixodeskAnimator = (() => {
     let anyHide = false;
     let allHide = true;
     for (const kf of kfs) {
-      if (hide((_a = kf.value) != null ? _a : kf.v)) anyHide = true;
+      if (hide(kfValue(kf))) anyHide = true;
       else allHide = false;
     }
     if (!anyHide) return void 0;
@@ -5209,10 +5278,10 @@ var PixodeskAnimator = (() => {
       const kf = kfs[i];
       const prevKf = i > 0 ? kfs[i - 1] : void 0;
       const nextKf = i < kfs.length - 1 ? kfs[i + 1] : void 0;
-      const t = (_c = (_b = kf.time) != null ? _b : kf.t) != null ? _c : 0;
-      const thisHide = hide((_d = kf.value) != null ? _d : kf.v);
-      const prevHide = prevKf ? thisHide && hide((_e = prevKf.value) != null ? _e : prevKf.v) : thisHide;
-      const nextHide = nextKf ? thisHide && hide((_f = nextKf.value) != null ? _f : nextKf.v) : thisHide;
+      const t = kfTime(kf);
+      const thisHide = hide(kfValue(kf));
+      const prevHide = prevKf ? thisHide && hide(kfValue(prevKf)) : thisHide;
+      const nextHide = nextKf ? thisHide && hide(kfValue(nextKf)) : thisHide;
       if (prevHide && !nextHide) {
         out.push({ time: t, value: 0 });
         out.push({ time: t + OPACITY_STEP_MS, value: 1 });
@@ -5227,14 +5296,11 @@ var PixodeskAnimator = (() => {
   function readRangeWithCrossings(raw) {
     const r = readAnimatable(raw);
     if (r.kind !== "animated" /* Animated */) return r;
-    const kfs = r.keyframes.map((kf) => {
-      var _a, _b, _c, _d;
-      return {
-        time: (_b = (_a = kf.time) != null ? _a : kf.t) != null ? _b : 0,
-        value: (_c = kf.value) != null ? _c : kf.v,
-        easing: (_d = kf.easing) != null ? _d : kf.e
-      };
-    });
+    const kfs = r.keyframes.map((kf) => ({
+      time: kfTime(kf),
+      value: kfValue(kf),
+      easing: kfEasing(kf)
+    }));
     const hasReverse = kfs.some((kf) => kf.value[0] > kf.value[1]);
     if (!hasReverse) {
       return {
@@ -5373,8 +5439,8 @@ var PixodeskAnimator = (() => {
       maskAncestorChains: /* @__PURE__ */ new Map(),
       // Resolved engine: `frames` ONLY when explicitly set; auto/waapi/unset →
       // waapi (we're not 100% sure it's frames, and CSS/WAAPI need the inline form).
-      engine: ((_a = getAnimatorConfig(root)) == null ? void 0 : _a.mode) === PxAnimatorMode.frames ? PxAnimatorEngine.frames : PxAnimatorEngine.waapi,
-      glyphs: (_b = getDefs(root)) == null ? void 0 : _b.glyphs
+      engine: resolveTimelineEngine((_a = getAnimatorConfig(root)) == null ? void 0 : _a.engine),
+      glyphs: (_b = getDefs(root)) == null ? void 0 : _b.fonts
     };
     const working = clone(root);
     indexById(working, ctx.idMap);
@@ -5397,7 +5463,7 @@ var PixodeskAnimator = (() => {
     let consumedByGlyphs = false;
     if (text == null ? void 0 : text.useGlyphs) {
       if (textPath) {
-        const pathD = typeof textPath.path === "string" ? textPath.path : void 0;
+        const pathD = typeof textPath.pathData === "string" ? textPath.pathData : void 0;
         const glyphed = applyTextGlyphsAlongPath(n, ctx, pathD, textPath.startOffset, textPath.textLength, textPath.pathOverflow);
         if (glyphed) {
           n = glyphed;
@@ -5430,27 +5496,7 @@ var PixodeskAnimator = (() => {
     return node;
   }
 
-  // ../svg-animator-core/src/PxOffsetPathMaterialiser.ts
-  var kfTime = (kf) => {
-    var _a, _b;
-    return (_b = (_a = kf.t) != null ? _a : kf.time) != null ? _b : 0;
-  };
-  var kfValue = (kf) => {
-    var _a;
-    return (_a = kf.v) != null ? _a : kf.value;
-  };
-  var kfEasing = (kf) => {
-    var _a;
-    return (_a = kf.e) != null ? _a : kf.easing;
-  };
-  var kfTangentIn = (kf) => {
-    var _a;
-    return (_a = kf.tangentIn) != null ? _a : kf.ti;
-  };
-  var kfTangentOut = (kf) => {
-    var _a;
-    return (_a = kf.tangentOut) != null ? _a : kf.to;
-  };
+  // ../svg-animator-core/src/materialise/PxOffsetPathMaterialiser.ts
   function cubicAt(p0, c1, c2, p1, t) {
     const u = 1 - t;
     const a = u * u * u, b = 3 * u * u * t, c = 3 * u * t * t, d = t * t * t;
@@ -5526,16 +5572,16 @@ var PixodeskAnimator = (() => {
         const built = buildOffsetPath(transform);
         if (built) {
           const newAnimate = __spreadValues({}, anim);
-          delete newAnimate["transform"];
+          delete newAnimate[TRANSFORM_ATTR];
           const distance = { keyframes: built.distanceKfs };
           if (transform.loop !== void 0) distance.loop = transform.loop;
-          newAnimate["offsetDistance"] = distance;
+          newAnimate[OFFSET_DISTANCE_ATTR] = distance;
           const staticTr = node.transform;
           let newTransform = staticTr;
           if (staticTr && typeof staticTr === "object") {
             const t = __spreadValues({}, staticTr);
-            delete t["translate"];
-            delete t["origin"];
+            delete t[TRANSFORM_PART.translate];
+            delete t[TRANSFORM_PART.origin];
             newTransform = Object.keys(t).length ? t : void 0;
           }
           out = __spreadProps(__spreadValues({}, node), {
@@ -5560,14 +5606,14 @@ var PixodeskAnimator = (() => {
     return walk(root);
   }
 
-  // ../svg-animator-core/src/PxAnimatorMaterialiseAll.ts
+  // ../svg-animator-core/src/materialise/PxAnimatorMaterialiseAll.ts
   function materialiseAllInTree(doc, engine, opts) {
     var _a, _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) {
+    if (engine === PxTimelineEngine.native) {
       root = materialiseMotionPathsInTree(root, opts == null ? void 0 : opts.motionPath);
       root = materialiseAnimatedUseInstances(root);
       root = pruneUnreferencedDefs(root);
@@ -5604,7 +5650,7 @@ var PixodeskAnimator = (() => {
     return root;
   }
 
-  // ../svg-animator-core/src/PxFrameLoop.ts
+  // ../svg-animator-core/src/playback/PxFrameLoop.ts
   function requestFrame(cb) {
     const g = globalThis;
     if (typeof g.requestAnimationFrame === "function") return g.requestAnimationFrame(cb);
@@ -5621,7 +5667,7 @@ var PixodeskAnimator = (() => {
   function createBasicFrameLoopAnimator(doc, adapter, callbacks) {
     var _a;
     const config = getAnimatorConfig(doc) || {};
-    const bindings = getNormalisedBindings(doc, PxAnimatorEngine.frames);
+    const bindings = getNormalisedBindings(doc, PxTimelineEngine.js);
     const _iterations = config.iterations;
     let iterations = 1;
     if (typeof _iterations === "number") iterations = _iterations || 1;
@@ -5882,7 +5928,194 @@ var PixodeskAnimator = (() => {
     return api;
   }
 
-  // src/PxAnimatorTriggers.ts
+  // ../svg-animator-core/src/playback/PxAnimatorConfigPatch.ts
+  var FLAT_ONLY_KEYS = [
+    "timelineSource",
+    "scroll",
+    "trigger",
+    "delay",
+    "iterations",
+    "direction",
+    "fill",
+    "resetOnFinish",
+    "duration",
+    "mode",
+    "frameRate"
+  ];
+  var CONTENT_KEYS = ["definitions", "animateById"];
+  var isPlainObject = (v) => !!v && typeof v === "object" && !Array.isArray(v);
+  var timelineTypeOf = (t) => isPlainObject(t) && typeof t.type === "string" ? t.type : "time";
+  var isScrollish = (type) => type === "scroll" || type === "view";
+  function mergePlain(base, patch) {
+    const out = isPlainObject(base) ? __spreadValues({}, base) : {};
+    for (const key of Object.keys(patch)) {
+      const value = patch[key];
+      if (value === null) {
+        delete out[key];
+        continue;
+      }
+      if (isPlainObject(value)) {
+        out[key] = mergePlain(out[key], value);
+        continue;
+      }
+      out[key] = value;
+    }
+    return out;
+  }
+  function mergeTimeline(base, patch, warn) {
+    const baseType = timelineTypeOf(base);
+    const patchNamesType = isPlainObject(patch) && typeof patch.type === "string";
+    const patchType = patchNamesType ? String(patch.type) : baseType;
+    let merged;
+    if (patchType !== baseType) {
+      const carried = {};
+      if (isPlainObject(base)) {
+        for (const k of PX_TIMELINE_SHARED_KEYS) {
+          if (base[k] !== void 0) carried[k] = base[k];
+        }
+      }
+      merged = mergePlain(carried, patch);
+    } else {
+      merged = mergePlain(base, patch);
+    }
+    if (isScrollish(patchType)) {
+      for (const k of PX_TIME_ONLY_TIMELINE_KEYS) {
+        if (merged[k] === void 0) continue;
+        warn("animator.timeline." + k + ": no slot on a '" + patchType + "' timeline \u2014 dropped");
+        delete merged[k];
+      }
+      if (merged.iterations === "infinite") {
+        warn("animator.timeline.iterations: 'infinite' cannot map onto a scroll range \u2014 dropped");
+        delete merged.iterations;
+      }
+    }
+    return merged;
+  }
+  function foldAnimatorConfigShortcuts(config, shortcuts) {
+    let base;
+    if (typeof config === "string") {
+      try {
+        base = JSON.parse(config);
+      } catch (e) {
+        console.warn("animator config: not valid JSON \u2014 ignored", e);
+        base = void 0;
+      }
+    } else {
+      base = config != null ? config : void 0;
+    }
+    const { duration, delay, iterations, startOn } = shortcuts;
+    if (duration === void 0 && delay === void 0 && iterations === void 0 && startOn === void 0) {
+      return base;
+    }
+    const out = isPlainObject(base) ? __spreadValues({}, base) : {};
+    const timeline = __spreadValues({}, out.timeline);
+    if (duration !== void 0) timeline.duration = duration;
+    if (delay !== void 0) timeline.delay = delay;
+    if (iterations !== void 0) timeline.iterations = iterations;
+    if (startOn !== void 0) {
+      timeline.trigger = __spreadProps(__spreadValues({}, timeline.trigger), { startOn });
+    }
+    out.timeline = timeline;
+    return out;
+  }
+  function mergeAnimatorConfig(base, patch) {
+    const warnings = [];
+    const warn = (m) => warnings.push(m);
+    if (patch === null) return { config: void 0, warnings };
+    if (!isPlainObject(patch) || Object.keys(patch).length === 0) {
+      return { config: base, warnings };
+    }
+    const flatInBase = isPlainObject(base) ? FLAT_ONLY_KEYS.filter((k) => base[k] !== void 0) : [];
+    if (flatInBase.length) {
+      warn("animator: the base carries the flat runtime spelling (" + flatInBase.join(", ") + "); the patch merges the wire spelling only");
+    }
+    const out = isPlainObject(base) ? __spreadValues({}, base) : {};
+    for (const key of Object.keys(patch)) {
+      const value = patch[key];
+      if (value === null) {
+        delete out[key];
+        continue;
+      }
+      if (key === "timeline") {
+        out.timeline = isPlainObject(value) ? mergeTimeline(out.timeline, value, warn) : value;
+        continue;
+      }
+      if (isPlainObject(value)) {
+        out[key] = mergePlain(out[key], value);
+        continue;
+      }
+      out[key] = value;
+    }
+    return { config: out, warnings };
+  }
+  function applyAnimatorConfig(doc, patch, opts) {
+    var _a, _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((_a = anyDoc.meta) == null ? void 0 : _a.animator);
+    const current = atRoot ? anyDoc.animator : atMeta ? anyDoc.meta.animator : void 0;
+    const warnings = [];
+    if (atRoot && isPlainObject((_b = anyDoc.meta) == null ? void 0 : _b.animator)) {
+      warnings.push("animator: doc.meta.animator is shadowed by doc.animator and was not patched");
+    }
+    let base = current;
+    if (reset) {
+      const kept = {};
+      for (const k of CONTENT_KEYS) {
+        if (isPlainObject(current) && current[k] !== void 0) kept[k] = current[k];
+      }
+      base = kept;
+    }
+    const merged = mergeAnimatorConfig(base, patch != null ? patch : {});
+    warnings.push(...merged.warnings);
+    if (merged.config === current) return { doc, warnings };
+    if (atMeta) {
+      return {
+        doc: __spreadProps(__spreadValues({}, anyDoc), { meta: __spreadProps(__spreadValues({}, anyDoc.meta), { animator: merged.config }) }),
+        warnings
+      };
+    }
+    return { doc: __spreadProps(__spreadValues({}, anyDoc), { animator: merged.config }), warnings };
+  }
+
+  // ../svg-animator-core/src/format/PxDocumentDiagnostic.ts
+  var MAX_REPORTED = 6;
+  var LEGACY_FLAT_KEYS = [
+    ...PX_TIMELINE_SHARED_KEYS,
+    ...PX_TIME_ONLY_TIMELINE_KEYS,
+    "fill",
+    "resetOnFinish",
+    "timelineSource",
+    "scroll"
+  ];
+  var isLegacyFlatAnimatorKey = (w) => LEGACY_FLAT_KEYS.some((k) => w.indexOf("animator." + k + ":") >= 0);
+  function diagnoseDocument(doc) {
+    let all;
+    try {
+      all = validateDocument(doc);
+    } catch (e) {
+      return { problems: [], legacy: [] };
+    }
+    const problems = [];
+    const legacy = [];
+    for (const w of all) (isLegacyFlatAnimatorKey(w) ? legacy : problems).push(w);
+    return { problems, legacy };
+  }
+  function reportDocumentDiagnostics(doc, where) {
+    const { problems } = diagnoseDocument(doc);
+    if (!problems.length) return;
+    const shown = problems.slice(0, MAX_REPORTED);
+    const more = problems.length - shown.length;
+    console.warn(
+      where + ": this document does not match the animation schema in " + problems.length + " place" + (problems.length === 1 ? "" : "s") + ".\n" + shown.map((p) => "  - " + p).join("\n") + (more > 0 ? "\n  \u2026 and " + more + " more" : "") + "\n\nIf you did not author these keys, the usual cause is a build that MANGLES PROPERTY NAMES. An animation document is data loaded at runtime, so renaming the property reads inside the player stops them matching the keys in the JSON, and the animation silently does nothing. Feed the published reserved-name list to your minifier \u2014 @pixodesk/svg-animator-web/mangle-reserved.json \u2014 see docs/library/minification.md."
+    );
+  }
+
+  // src/triggers/PxAnimatorTriggers.ts
   function setupAnimationTriggers(api, config) {
     const { startOn, outAction = "continue", scrollIntoViewThreshold = 0 } = config;
     const root = api.getRootElement();
@@ -5987,7 +6220,7 @@ var PixodeskAnimator = (() => {
     return api;
   }
 
-  // src/PxAnimatorFrameLoop.ts
+  // src/engines/PxAnimatorFrameLoop.ts
   function getSelector(id) {
     return "#" + id;
   }
@@ -6047,11 +6280,10 @@ var PixodeskAnimator = (() => {
     return adapter;
   }
 
-  // src/PxAnimatorWebApi.ts
+  // src/engines/PxAnimatorWebApi.ts
   function createCssKf(kf, t, propName, unsupportedSet) {
-    var _a, _b;
-    let value = (_a = kf.v) != null ? _a : kf.value;
-    const e = (_b = kf.e) != null ? _b : kf.easing;
+    let value = kfValue(kf);
+    const e = kfEasing(kf);
     const cssKf = {
       offset: t,
       easing: e && Array.isArray(e) ? "cubic-bezier(" + e.join(",") + ")" : void 0
@@ -6156,7 +6388,7 @@ var PixodeskAnimator = (() => {
         console.warn("createFrameLoopAnimator: No root element provided");
       }
     }
-    const bindings = getNormalisedBindings(doc, PxAnimatorEngine.waapi);
+    const bindings = getNormalisedBindings(doc, PxTimelineEngine.native);
     const animations = [];
     const _iterations = config.iterations;
     let iterations;
@@ -6314,7 +6546,7 @@ var PixodeskAnimator = (() => {
     return api;
   }
 
-  // src/PxScrollDriver.ts
+  // src/scroll/PxScrollDriver.ts
   function nativeRangeOffset(point, defaultFraction, view) {
     var _a, _b, _c;
     const fraction = typeof (point == null ? void 0 : point.fraction) === "number" ? point.fraction : defaultFraction;
@@ -6328,7 +6560,7 @@ var PixodeskAnimator = (() => {
     const scroll = config.scroll || {};
     const kind = (_a = scroll.kind) != null ? _a : "view";
     if (scroll.smoothing) {
-      console.warn('scroll timeline: `smoothing` needs the built-in driver \u2014 ignoring `driver: "native"`');
+      console.warn("scroll timeline: `smoothing` needs the built-in driver \u2014 using the built-in driver instead of the browser timeline");
       return null;
     }
     const g = globalThis;
@@ -6345,7 +6577,7 @@ var PixodeskAnimator = (() => {
         timeline = new Ctor({ source, axis });
       }
     } catch (e) {
-      console.warn("scroll timeline: native timeline construction failed \u2014 falling back to the custom driver", e);
+      console.warn("scroll timeline: native timeline construction failed \u2014 falling back to the player measuring progress itself", e);
       return null;
     }
     return {
@@ -6564,7 +6796,7 @@ var PixodeskAnimator = (() => {
     };
   }
 
-  // src/PxAnimatorBind.ts
+  // src/engines/PxAnimatorBind.ts
   function finaliseAnimator(animatorConfig, callbacks, make) {
     let apiRef;
     let effectiveCallbacks = callbacks;
@@ -6579,8 +6811,8 @@ var PixodeskAnimator = (() => {
     }
     const res = make(effectiveCallbacks);
     apiRef = res;
-    if (animatorConfig.debugInstName) {
-      window[animatorConfig.debugInstName] = res;
+    if (animatorConfig.debugGlobalName) {
+      window[animatorConfig.debugGlobalName] = res;
     }
     return res;
   }
@@ -6588,10 +6820,10 @@ var PixodeskAnimator = (() => {
     const animatorConfig = getAnimatorConfig(doc) || {};
     if (isScrollTimeline(animatorConfig)) {
       return finaliseAnimator(animatorConfig, callbacks, (cb) => {
-        var _a, _b;
+        var _a;
         let unpin = () => {
         };
-        if (animatorConfig.mode !== PxAnimatorMode.frames && ((_a = animatorConfig.scroll) == null ? void 0 : _a.driver) === "native" && rootElement) {
+        if (mayUseNativeScrollTimeline(animatorConfig.engine) && rootElement) {
           unpin = applyScrollPin(rootElement, animatorConfig.scroll);
           const native = createNativeScrollTimeline(rootElement, animatorConfig);
           if (native) {
@@ -6599,7 +6831,7 @@ var PixodeskAnimator = (() => {
               doc,
               cb,
               rootElement,
-              animatorConfig.mode === PxAnimatorMode.waapi,
+              isNativeForced(animatorConfig.engine),
               native
             );
             if (api2) {
@@ -6615,8 +6847,8 @@ var PixodeskAnimator = (() => {
           unpin = () => {
           };
         }
-        const api = (animatorConfig.mode !== PxAnimatorMode.frames ? createWebApiAnimator(doc, cb, rootElement, animatorConfig.mode === PxAnimatorMode.waapi) : null) || createFrameLoopAnimator(doc, adapter, cb, rootElement);
-        const subject = ((_b = api.getRootElement) == null ? void 0 : _b.call(api)) || rootElement;
+        const api = (animatorConfig.engine !== PxTimelineEngineExtra.js ? createWebApiAnimator(doc, cb, rootElement, isNativeForced(animatorConfig.engine)) : null) || createFrameLoopAnimator(doc, adapter, cb, rootElement);
+        const subject = ((_a = api.getRootElement) == null ? void 0 : _a.call(api)) || rootElement;
         if (subject) {
           unpin = applyScrollPin(subject, animatorConfig.scroll);
           const totalMs = scrollTotalDurationMs(animatorConfig);
@@ -6640,20 +6872,19 @@ var PixodeskAnimator = (() => {
       });
     }
     return finaliseAnimator(animatorConfig, callbacks, (cb) => {
-      if (animatorConfig.mode === PxAnimatorMode.frames) {
+      if (animatorConfig.engine === PxTimelineEngineExtra.js) {
         return createFrameLoopAnimator(doc, adapter, cb, rootElement);
       }
       return createWebApiAnimator(
         doc,
         cb,
         rootElement,
-        animatorConfig.mode === PxAnimatorMode.waapi
-        // forcing waapi
+        isNativeForced(animatorConfig.engine)
       ) || createFrameLoopAnimator(doc, adapter, cb, rootElement);
     });
   }
 
-  // src/PxAnimatorDOM.ts
+  // src/dom/PxAnimatorDOM.ts
   var SVG_NS = "http://www.w3.org/2000/svg";
   function createElement(tagName, normalisedProps, style, children, textContent) {
     if (DISALLOWED_SVG_TAGS_LOWER.has(tagName.toLowerCase())) {
@@ -6711,18 +6942,24 @@ var PixodeskAnimator = (() => {
     return element;
   }
 
-  // src/PxAnimatorKeys.ts
+  // src/shared/PxAnimatorKeys.ts
   var PX_ANIMATOR_DATA_KEY = "data";
 
-  // src/PxAnimator.ts
+  // src/animator/PxAnimator.ts
   function createAnimatorFromConfig(doc, adapter, callbacks, rootElement) {
     return bindWithEngineChoice(doc, adapter, callbacks, rootElement);
   }
-  function createAnimatorImpl(doc, adapter, callbacks, containerElement) {
+  function createAnimatorImpl(doc, adapter, callbacks, containerElement, config, resetDocDefaults) {
     const effectsWarnings = validateNodeEffects(doc);
     for (const w of effectsWarnings) console.warn("[PxAnimator] effects shape warning:", w);
+    reportDocumentDiagnostics(doc, "[PxAnimator] createAnimator");
+    if (config !== void 0 || resetDocDefaults) {
+      const patched = applyAnimatorConfig(doc, config != null ? config : {}, { resetDefaults: !!resetDocDefaults });
+      for (const w of patched.warnings) console.warn("[PxAnimator] config override:", w);
+      doc = patched.doc;
+    }
     const animatorConfig = getAnimatorConfig(doc) || {};
-    const engine = animatorConfig.mode === PxAnimatorMode.frames ? PxAnimatorEngine.frames : PxAnimatorEngine.waapi;
+    const engine = resolveTimelineEngine(animatorConfig.engine);
     doc = materialiseAllInTree(doc, engine);
     let rootElement = null;
     if (containerElement) {
@@ -6746,8 +6983,13 @@ var PixodeskAnimator = (() => {
     }
     return api;
   }
+  function resolveAnimatorConfigOption(options) {
+    const { config, duration, delay, iterations, startOn } = options;
+    return foldAnimatorConfigShortcuts(config, { duration, delay, iterations, startOn });
+  }
   function createAnimator(options) {
-    const { src, data, adapter, callbacks, container } = options;
+    const { src, data, adapter, callbacks, container, resetDocDefaults } = options;
+    const config = resolveAnimatorConfigOption(options);
     if (data !== void 0 && src !== void 0) {
       throw new Error("createAnimator: provide either `src` or `data`, not both");
     }
@@ -6755,7 +6997,7 @@ var PixodeskAnimator = (() => {
       throw new Error("createAnimator: either `src` or `data` is required");
     }
     if (data !== void 0) {
-      return createAnimatorImpl(data, adapter, callbacks, container);
+      return createAnimatorImpl(data, adapter, callbacks, container, config, resetDocDefaults);
     }
     let animator = null;
     let pending = [];
@@ -6770,7 +7012,7 @@ var PixodeskAnimator = (() => {
     fetch(src).then((res) => res.json()).then((json) => {
       if (destroyed) return;
       if (isPxElementFileFormat(json)) {
-        animator = createAnimatorImpl(json, adapter, callbacks, container);
+        animator = createAnimatorImpl(json, adapter, callbacks, container, config, resetDocDefaults);
         const queued = pending;
         pending = null;
         queued == null ? void 0 : queued.forEach((call) => call(animator));