route-graphics 1.40.0 → 1.42.0

package/dist/cli/routeGraphicsCli.js

@@ -2770,6 +2770,9 @@ var normalizeKeyframes = (propertyConfig, path5, assertValue = assertNumber, nor
     const keyframePath = `${path5}.keyframes[${index}]`;
     assertPlainObject3(keyframe, keyframePath);
     assertValue(keyframe.value, `${keyframePath}.value`);
+    if (keyframe.startValue !== void 0) {
+      assertValue(keyframe.startValue, `${keyframePath}.startValue`);
+    }
     assertNonNegativeSafeIntegerMilliseconds(
       keyframe.duration,
       `${keyframePath}.duration`
@@ -2793,6 +2796,7 @@ var normalizeKeyframes = (propertyConfig, path5, assertValue = assertNumber, nor
     }
     return {
       value: normalizeValue(keyframe.value),
+      ...keyframe.startValue === void 0 ? {} : { startValue: normalizeValue(keyframe.startValue) },
       duration: keyframe.duration,
       easing: keyframe.easing ?? "linear",
       ...keyframe.delay > 0 ? { delay: keyframe.delay } : {},
@@ -3604,12 +3608,9 @@ var NO_AUDIO_PLAYBACK_POSITION_OPERATIONS = /* @__PURE__ */ new Set();
 var AUDIO_PLAYBACK_KEYS = /* @__PURE__ */ new Set(["commandId", "operation", "positionMs"]);
 var AUDIO_TRANSITION_TYPE = "audio-transition";
 var AUDIO_EFFECT_TYPES = /* @__PURE__ */ new Set([AUDIO_TRANSITION_TYPE]);
+var AUDIO_EFFECT_KEYS = /* @__PURE__ */ new Set(["id", "type", "targetId", "properties"]);
 var AUDIO_TRANSITION_PHASES = /* @__PURE__ */ new Set(["enter", "exit", "update"]);
 var AUDIO_TRANSITION_PROPERTIES = /* @__PURE__ */ new Set(["volume", "pan", "playbackRate"]);
-var AUDIO_TRANSITION_PROPERTIES_BY_NODE_TYPE = {
-  "audio-channel": /* @__PURE__ */ new Set(["volume", "pan"]),
-  sound: /* @__PURE__ */ new Set(["volume", "pan", "playbackRate"])
-};
 var AUDIO_TRANSITION_PROPERTY_RANGES = {
   volume: { min: 0, max: 100 },
   pan: { min: -1, max: 1 },
@@ -3619,6 +3620,7 @@ var AUDIO_EASINGS = new Set(SUPPORTED_EASING_NAMES);
 var AUDIO_TRANSITION_PHASE_KEYS = /* @__PURE__ */ new Set(["initialValue", "keyframes"]);
 var AUDIO_TRANSITION_KEYFRAME_KEYS = /* @__PURE__ */ new Set([
   "value",
+  "startValue",
   "duration",
   "delay",
   "easing",
@@ -3729,7 +3731,7 @@ var normalizePlaybackCommand = (playback, path5, {
     ...requiresPosition ? { positionMs: playback.positionMs } : {}
   };
 };
-var validateSound = (node, path5, ids, flattenedSounds, inlineTransitions, channelId = null) => {
+var validateSound = (node, path5, ids, flattenedSounds, channelId = null) => {
   assertNonEmptyString3(node.id, `${path5}.id`);
   assertUniqueId(ids, node.id, `${path5}.id`);
   assertNonEmptyString3(node.src, `${path5}.src`);
@@ -3753,16 +3755,8 @@ var validateSound = (node, path5, ids, flattenedSounds, inlineTransitions, chann
   }
   const playback = node.playback === void 0 ? void 0 : normalizePlaybackCommand(node.playback, `${path5}.playback`);
   if (node.transition !== void 0) {
-    inlineTransitions.set(
-      node.id,
-      validateInlineAudioTransition(node.transition, `${path5}.transition`, {
-        nodeType: "sound",
-        propertyValues: {
-          volume,
-          pan: node.pan ?? 0,
-          playbackRate: node.playbackRate ?? 1
-        }
-      })
+    throw new Error(
+      `Input error: ${path5}.transition is not supported. Use top-level audioEffects instead.`
     );
   }
   flattenedSounds.push({
@@ -3781,7 +3775,7 @@ var validateSound = (node, path5, ids, flattenedSounds, inlineTransitions, chann
     ...playback ? { playback } : {}
   });
 };
-var validateChannel = (node, path5, ids, flattenedChannels, flattenedSounds, inlineTransitions) => {
+var validateChannel = (node, path5, ids, flattenedChannels, flattenedSounds) => {
   assertNonEmptyString3(node.id, `${path5}.id`);
   assertUniqueId(ids, node.id, `${path5}.id`);
   const volume = normalizeVolumeValue(node.volume, `${path5}.volume`);
@@ -3803,15 +3797,8 @@ var validateChannel = (node, path5, ids, flattenedChannels, flattenedSounds, inl
     positionOperations: NO_AUDIO_PLAYBACK_POSITION_OPERATIONS
   });
   if (node.transition !== void 0) {
-    inlineTransitions.set(
-      node.id,
-      validateInlineAudioTransition(node.transition, `${path5}.transition`, {
-        nodeType: "audio-channel",
-        propertyValues: {
-          volume,
-          pan: node.pan ?? 0
-        }
-      })
+    throw new Error(
+      `Input error: ${path5}.transition is not supported. Use top-level audioEffects instead.`
     );
   }
   flattenedChannels.push({
@@ -3850,14 +3837,7 @@ var validateChannel = (node, path5, ids, flattenedChannels, flattenedSounds, inl
         `Input error: ${childPath}.playback is not allowed when ${path5}.playback is present.`
       );
     }
-    validateSound(
-      child,
-      childPath,
-      ids,
-      flattenedSounds,
-      inlineTransitions,
-      node.id
-    );
+    validateSound(child, childPath, ids, flattenedSounds, node.id);
   }
 };
 var validateAudioNodes = (audio, ids) => {
@@ -3866,7 +3846,6 @@ var validateAudioNodes = (audio, ids) => {
   }
   const flattenedChannels = [];
   const flattenedSounds = [];
-  const inlineTransitions = /* @__PURE__ */ new Map();
   const builtinNodeIds = /* @__PURE__ */ new Set();
   for (const [index, node] of audio.entries()) {
     const path5 = `audio[${index}]`;
@@ -3877,14 +3856,7 @@ var validateAudioNodes = (audio, ids) => {
       continue;
     }
     if (node.type === "audio-channel") {
-      validateChannel(
-        node,
-        path5,
-        ids,
-        flattenedChannels,
-        flattenedSounds,
-        inlineTransitions
-      );
+      validateChannel(node, path5, ids, flattenedChannels, flattenedSounds);
       builtinNodeIds.add(node.id);
       for (const sound of flattenedSounds) {
         if (sound.channelId === node.id) {
@@ -3892,14 +3864,13 @@ var validateAudioNodes = (audio, ids) => {
         }
       }
     } else {
-      validateSound(node, path5, ids, flattenedSounds, inlineTransitions);
+      validateSound(node, path5, ids, flattenedSounds);
       builtinNodeIds.add(node.id);
     }
   }
   return {
     channels: flattenedChannels,
     sounds: flattenedSounds,
-    inlineTransitions,
     builtinNodeIds,
     builtinNodeTypes: new Map(
       [...flattenedChannels, ...flattenedSounds].map((node) => [
@@ -3909,7 +3880,7 @@ var validateAudioNodes = (audio, ids) => {
     )
   };
 };
-var validateTransitionPhase = (phase, path5, propertyName, { finalValue } = {}) => {
+var validateTransitionPhase = (phase, path5, propertyName) => {
   assertRecord(phase, path5);
   for (const key of Object.keys(phase)) {
     if (!AUDIO_TRANSITION_PHASE_KEYS.has(key)) {
@@ -3948,6 +3919,13 @@ var validateTransitionPhase = (phase, path5, propertyName, { finalValue } = {})
       `${keyframePath}.value`,
       keyframe.relative ? void 0 : AUDIO_TRANSITION_PROPERTY_RANGES[propertyName]
     );
+    if (keyframe.startValue !== void 0) {
+      assertFiniteNumber2(
+        keyframe.startValue,
+        `${keyframePath}.startValue`,
+        keyframe.relative ? void 0 : AUDIO_TRANSITION_PROPERTY_RANGES[propertyName]
+      );
+    }
     if (keyframe.duration === void 0) {
       throw new Error(`Input error: ${keyframePath}.duration is required.`);
     }
@@ -3964,61 +3942,9 @@ var validateTransitionPhase = (phase, path5, propertyName, { finalValue } = {})
     }
     assertOptionalBoolean(keyframe.relative, `${keyframePath}.relative`);
   }
-  if (finalValue !== void 0) {
-    const finalKeyframe = phase.keyframes[phase.keyframes.length - 1];
-    if (finalKeyframe.relative === true) {
-      throw new Error(
-        `Input error: ${path5}.keyframes must end with an absolute value.`
-      );
-    }
-    if (finalKeyframe.value !== finalValue) {
-      throw new Error(
-        `Input error: ${path5}.keyframes must end at the node's declared ${propertyName} value ${finalValue}.`
-      );
-    }
-  }
 };
-function validateInlineAudioTransition(transition, path5, { nodeType, propertyValues }) {
-  assertNonEmptyRecord(transition, path5);
-  const normalizedProperties = {};
-  for (const [phaseName, propertyTracks] of Object.entries(transition)) {
-    if (!AUDIO_TRANSITION_PHASES.has(phaseName)) {
-      throw new Error(
-        `Input error: unsupported inline audio transition phase "${phaseName}" at ${path5}.`
-      );
-    }
-    assertNonEmptyRecord(propertyTracks, `${path5}.${phaseName}`);
-    for (const [propertyName, track] of Object.entries(propertyTracks)) {
-      if (!AUDIO_TRANSITION_PROPERTIES.has(propertyName)) {
-        throw new Error(
-          `Input error: unsupported inline audio transition property "${propertyName}" at ${path5}.${phaseName}.`
-        );
-      }
-      if (!AUDIO_TRANSITION_PROPERTIES_BY_NODE_TYPE[nodeType].has(propertyName)) {
-        throw new Error(
-          `Input error: inline audio transition property "${propertyName}" is not supported for node type "${nodeType}" at ${path5}.${phaseName}.`
-        );
-      }
-      validateTransitionPhase(
-        track,
-        `${path5}.${phaseName}.${propertyName}`,
-        propertyName,
-        phaseName === "enter" || phaseName === "update" ? { finalValue: propertyValues[propertyName] } : {}
-      );
-      normalizedProperties[propertyName] ??= {};
-      normalizedProperties[propertyName][phaseName] = track;
-    }
-  }
-  return normalizedProperties;
-}
-var validateAudioTransition = (effect, path5, nodeTypes) => {
+var validateAudioTransition = (effect, path5) => {
   assertNonEmptyString3(effect.targetId, `${path5}.targetId`);
-  const targetType = nodeTypes.get(effect.targetId);
-  if (!targetType) {
-    throw new Error(
-      `Input error: ${path5}.targetId "${effect.targetId}" does not resolve to an audio node.`
-    );
-  }
   assertNonEmptyRecord(effect.properties, `${path5}.properties`);
   for (const [propertyName, propertyTransitions] of Object.entries(
     effect.properties
@@ -4028,11 +3954,6 @@ var validateAudioTransition = (effect, path5, nodeTypes) => {
         `Input error: unsupported audio transition property "${propertyName}" at ${path5}.properties.`
       );
     }
-    if (!AUDIO_TRANSITION_PROPERTIES_BY_NODE_TYPE[targetType].has(propertyName)) {
-      throw new Error(
-        `Input error: audio transition property "${propertyName}" is not supported for target type "${targetType}" at ${path5}.properties.`
-      );
-    }
     assertNonEmptyRecord(
       propertyTransitions,
       `${path5}.properties.${propertyName}`
@@ -4051,7 +3972,7 @@ var validateAudioTransition = (effect, path5, nodeTypes) => {
     }
   }
 };
-var validateAudioEffects = (audioEffects, ids, nodeTypes) => {
+var validateAudioEffects = (audioEffects, ids) => {
   if (!Array.isArray(audioEffects)) {
     throw new Error("Input error: `audioEffects` must be an array.");
   }
@@ -4062,13 +3983,20 @@ var validateAudioEffects = (audioEffects, ids, nodeTypes) => {
     assertRecord(effect, path5);
     assertNonEmptyString3(effect.id, `${path5}.id`);
     assertUniqueId(ids, effect.id, `${path5}.id`);
+    for (const key of Object.keys(effect)) {
+      if (!AUDIO_EFFECT_KEYS.has(key)) {
+        throw new Error(
+          `Input error: unsupported audio effect field "${key}" at ${path5}.`
+        );
+      }
+    }
     if (!AUDIO_EFFECT_TYPES.has(effect.type)) {
       throw new Error(
         `Input error: unsupported audio effect type "${effect.type}" at ${path5}.`
       );
     }
     if (effect.type === AUDIO_TRANSITION_TYPE) {
-      validateAudioTransition(effect, path5, nodeTypes);
+      validateAudioTransition(effect, path5);
       if (transitionTargetIds.has(effect.targetId)) {
         throw new Error(
           `Input error: duplicate audio-transition targetId "${effect.targetId}" at ${path5}.targetId.`
@@ -4086,25 +4014,14 @@ var normalizeAudioRenderState = ({
 } = {}) => {
   const ids = /* @__PURE__ */ new Set();
   const flattened = validateAudioNodes(audio, ids);
-  const transitions = validateAudioEffects(
-    audioEffects,
-    ids,
-    flattened.builtinNodeTypes
-  );
-  for (const [targetId, properties] of flattened.inlineTransitions) {
-    if (transitions.has(targetId)) {
-      throw new Error(
-        `Input error: audio node "${targetId}" cannot define both inline transition and legacy audio-transition input.`
-      );
-    }
-    transitions.set(targetId, properties);
-  }
+  const transitions = validateAudioEffects(audioEffects, ids);
   return {
     audio,
     audioEffects,
     channels: flattened.channels,
     sounds: flattened.sounds,
-    transitions
+    transitions,
+    effectById: new Map(audioEffects.map((effect) => [effect.id, effect]))
   };
 };
 
@@ -6152,6 +6069,19 @@ var compilePortableGsapAnimation = (rawAnimation, { sourcePath = "animation" } =
 
 // src/plugins/animations/timeline/compileLegacyTransition.js
 var toPortableFrameValue = (frame) => frame.relative ? { by: frame.value } : frame.value;
+var toPortableFrameStartValue = (frame) => frame.relative ? { by: frame.startValue } : frame.startValue;
+var toPortableFrameStep = (target, property, frame) => ({
+  kind: frame.startValue === void 0 ? "to" : "fromTo",
+  targets: target,
+  overwrite: "none",
+  ...frame.startValue === void 0 ? { values: { [property]: toPortableFrameValue(frame) } } : {
+    from: { [property]: toPortableFrameStartValue(frame) },
+    to: { [property]: toPortableFrameValue(frame) }
+  },
+  duration: frame.duration,
+  ...frame.delay === void 0 ? {} : { delay: frame.delay },
+  ...frame.easing === void 0 ? {} : { easing: frame.easing }
+});
 var addInitialTrackDelay = (config, delay = 0) => {
   if (delay === 0) return config;
   return {
@@ -6172,17 +6102,26 @@ var addLegacyTrack = (steps, { target, property, config }) => {
     });
   }
   if (config.keyframes.length > 0) {
-    children.push({
-      kind: "keyframes",
-      targets: target,
-      overwrite: "none",
-      frames: config.keyframes.map((frame) => ({
-        values: { [property]: toPortableFrameValue(frame) },
-        duration: frame.duration,
-        ...frame.delay === void 0 ? {} : { delay: frame.delay },
-        ...frame.easing === void 0 ? {} : { easing: frame.easing }
-      }))
-    });
+    if (config.keyframes.some((frame) => frame.startValue !== void 0)) {
+      children.push({
+        kind: "sequence",
+        steps: config.keyframes.map(
+          (frame) => toPortableFrameStep(target, property, frame)
+        )
+      });
+    } else {
+      children.push({
+        kind: "keyframes",
+        targets: target,
+        overwrite: "none",
+        frames: config.keyframes.map((frame) => ({
+          values: { [property]: toPortableFrameValue(frame) },
+          duration: frame.duration,
+          ...frame.delay === void 0 ? {} : { delay: frame.delay },
+          ...frame.easing === void 0 ? {} : { easing: frame.easing }
+        }))
+      });
+    }
   }
   if (children.length === 1) steps.push(children[0]);
   else if (children.length > 1)
@@ -6282,6 +6221,11 @@ var addRelativeValue = (property, expression) => ({
     right: expression
   } : expression
 });
+var resolveFrameStart = (property, frame, currentExpression) => {
+  if (frame.startValue === void 0) return currentExpression;
+  const authored = constant2(frame.startValue);
+  return frame.relative ? addRelativeValue(property, authored) : toSubjectCoordinate(property, authored);
+};
 var toIterations = (playback = {}) => {
   if (playback.loop === true || playback.repeat === "infinite") return null;
   return (playback.repeat ?? 0) + 1;
@@ -6388,6 +6332,11 @@ var compileLegacyTweenAnimation = (animation, { sourcePath = "animation" } = {})
           frame.delay ?? 0,
           `${propertyPath}.keyframes[${index}].delay`
         );
+        const startExpression = resolveFrameStart(
+          property,
+          frame,
+          currentExpression
+        );
         const authored = constant2(frame.value);
         const nextExpression = frame.relative ? addRelativeValue(property, authored) : toSubjectCoordinate(property, authored);
         clips.push({
@@ -6402,7 +6351,7 @@ var compileLegacyTweenAnimation = (animation, { sourcePath = "animation" } = {})
           duration: frame.duration,
           sampler: {
             kind: "interpolate",
-            from: currentExpression,
+            from: startExpression,
             to: nextExpression,
             easing: getEasingId(frame.easing)
           },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "route-graphics",
-  "version": "1.40.0",
+  "version": "1.42.0",
   "description": "A 2D graphics rendering interface that takes JSON input and renders pixels using PixiJS",
   "main": "dist/RouteGraphics.js",
   "type": "module",