@vosjs/studio-core 0.42.4 → 0.43.0

package/dist/index.js

@@ -3791,7 +3791,7 @@ import {
   EASINGS,
   lerpArray as lerpArray2,
   sample as sample2,
-  segmentRate as segmentRate2,
+  segmentRate as segmentRate3,
   sortKeyframes as sortKeyframes2,
   sourceToTimeline,
   splitBySpeed as splitBySpeed3,
@@ -4709,6 +4709,114 @@ function round42(v) {
   return Math.round(v * 1e5) / 1e5;
 }
 
+// src/lower/anchor.ts
+import { segmentRate } from "@vosjs/timeline";
+var ELAPSED_PLACEHOLDER = "{elapsed}";
+var EPS = 1e-9;
+function sourceMomentToOutput(rated, t, media) {
+  if (!Number.isFinite(t)) return null;
+  let acc = 0;
+  let edge = null;
+  for (const p of rated) {
+    const rate = segmentRate(p);
+    const len = Math.max(0, p.out - p.in) / rate;
+    if (sameMedia(p.media, media)) {
+      if (t >= p.in - EPS && t < p.out - EPS)
+        return acc + Math.max(0, t - p.in) / rate;
+      if (edge === null && Math.abs(t - p.out) <= 1e-6) edge = acc + len;
+    }
+    acc += len;
+  }
+  return edge;
+}
+var isNum = (v) => typeof v === "number" && Number.isFinite(v);
+function stepElapsedMs(meta, step) {
+  const skips = Array.isArray(meta.skips) ? meta.skips : [];
+  for (const raw of skips) {
+    if (!raw || typeof raw !== "object") continue;
+    const s = raw;
+    if (!isNum(s.ms) || s.ms < 0) continue;
+    const named = step.id !== void 0 && (s.id === step.id || s.step === step.id) || s.step === step.step;
+    if (named) return s.ms;
+  }
+  const own = step.offCameraMs;
+  return isNum(own) && own >= 0 ? own : null;
+}
+function elapsedFor(meta, step) {
+  const own = stepElapsedMs(meta, step);
+  if (own !== null) return { ms: own };
+  const earlier = (meta.steps ?? []).filter((s) => s !== step && s.step < step.step).sort((a, b) => b.step - a.step);
+  for (const s of earlier) {
+    const ms = stepElapsedMs(meta, s);
+    if (ms !== null) return { ms, from: s };
+  }
+  return null;
+}
+function resolveAnchor(doc, anchor, rated) {
+  const source = mediaSource(doc, anchor.media);
+  if (!source) return { start: null, miss: "media" };
+  const meta = source.meta;
+  const step = findStep(meta.steps ?? [], anchor.step);
+  if (!step) return { start: null, miss: "step" };
+  const elapsed = elapsedFor(meta, step);
+  const extra = elapsed ? {
+    elapsedMs: elapsed.ms,
+    ...elapsed.from ? { elapsedFrom: elapsed.from } : {}
+  } : {};
+  if (step.skipped) return { start: null, step, miss: "skipped", ...extra };
+  const moment = anchor.at === "end" ? step.tEnd : step.tStart;
+  const out = sourceMomentToOutput(rated, moment, anchor.media);
+  if (out === null) return { start: null, step, miss: "cut", ...extra };
+  const offset = isNum(anchor.offset) ? anchor.offset : 0;
+  return { start: round33(Math.max(0, out + offset)), step, ...extra };
+}
+var round33 = (v) => Math.round(v * 1e3) / 1e3;
+function formatElapsed(ms) {
+  const s = Math.max(0, ms) / 1e3;
+  const plural = (n, unit) => `${n} ${unit}${n === 1 ? "" : "s"}`;
+  if (s < 9.5) return plural(Math.max(1, Math.round(s)), "second");
+  if (s < 57.5) return plural(Math.round(s / 5) * 5, "second");
+  const m = s / 60;
+  if (m < 59.5) return plural(Math.max(1, Math.round(m)), "minute");
+  const h = m / 60;
+  if (h < 47.5) return plural(Math.max(1, Math.round(h)), "hour");
+  return plural(Math.round(h / 24), "day");
+}
+function hasElapsed(text) {
+  if (typeof text === "string") return text.includes(ELAPSED_PLACEHOLDER);
+  return Array.isArray(text) && text.some(
+    (r) => typeof r?.text === "string" && r.text.includes(ELAPSED_PLACEHOLDER)
+  );
+}
+function fillElapsed(text, words) {
+  const fill = (s) => s.split(ELAPSED_PLACEHOLDER).join(words);
+  if (typeof text === "string") return fill(text);
+  return text.map(
+    (r) => typeof r.text === "string" && r.text.includes(ELAPSED_PLACEHOLDER) ? { ...r, text: fill(r.text) } : r
+  );
+}
+function anchoredClip(clip, doc, rated) {
+  if (!clip.anchor || typeof clip.anchor !== "object") return clip;
+  const r = resolveAnchor(doc, clip.anchor, rated);
+  let next = clip;
+  if (r.start !== null && r.start !== clip.start)
+    next = { ...next, start: r.start };
+  if (next.kind === "text" && r.elapsedMs !== void 0 && hasElapsed(next.text)) {
+    next = { ...next, text: fillElapsed(next.text, formatElapsed(r.elapsedMs)) };
+  }
+  return next;
+}
+function resolveOverlayAnchors(doc, rated) {
+  const overlays = Array.isArray(doc.overlays) ? doc.overlays : [];
+  if (!overlays.some((o) => o && o.anchor)) return doc;
+  return {
+    ...doc,
+    overlays: overlays.map(
+      (o) => o && o.anchor ? anchoredClip(o, doc, rated) : o
+    )
+  };
+}
+
 // src/lower/cursorIdle.ts
 var CURSOR_IDLE_HOLD = 1;
 var CURSOR_IDLE_FADE_OUT = 0.35;
@@ -6264,7 +6372,7 @@ var STUDIO_FRAME = `(ctx, content, dt) => {
 }`;
 
 // src/lower/extractClicks.ts
-import { segmentRate } from "@vosjs/timeline";
+import { segmentRate as segmentRate2 } from "@vosjs/timeline";
 var CLICK_FX_PRE = 0.06;
 var CLICK_RIPPLE_DUR = 0.45;
 var CLICK_PULSE_DUR = 0.35;
@@ -6277,7 +6385,7 @@ function outputAt(segments, sourceT, media) {
   if (!segments.length) return sourceT;
   let acc = 0;
   for (const s of segments) {
-    const rate = segmentRate(s);
+    const rate = segmentRate2(s);
     if (sameMedia(s.media, media) && sourceT >= s.in && sourceT <= s.out)
       return acc + (sourceT - s.in) / rate;
     acc += Math.max(0, s.out - s.in) / rate;
@@ -6288,7 +6396,7 @@ function keptOutputEnd(segments, sIn, sOut, media) {
   let acc = 0;
   let end = null;
   for (const p of segments) {
-    const rate = segmentRate(p);
+    const rate = segmentRate2(p);
     if (sameMedia(p.media, media)) {
       const ovIn = Math.max(sIn, p.in);
       const ovOut = Math.min(sOut, p.out);
@@ -6401,7 +6509,7 @@ function spanOutputExtent(segments, sIn, sOut, media) {
   let start = null;
   let end = null;
   for (const p of segments) {
-    const rate = segmentRate2(p);
+    const rate = segmentRate3(p);
     const len = Math.max(0, p.out - p.in) / rate;
     if (!sameMedia(p.media, media)) {
       acc += len;
@@ -6911,9 +7019,24 @@ var SETUP = `async (ctx) => {
     ;(ns.videoBlobs || (ns.videoBlobs = new Map())).set(src, fetched)
     return URL.createObjectURL(fetched)
   }
+  // Every element handed out by this SETUP, so two players never share one.
+  // A take may name one file as two media (the same shot as a teaser and in
+  // full), or as a media and the footage; the by-src cache would hand both
+  // ONE element, and ON_FRAME's concat rule, which pauses every media that
+  // is not under the playhead, then paused the playing clip every frame under
+  // the other name: play/pause churn, the element falling behind the clock,
+  // and a drift-guard seek every ~0.3 s that read as a stuck picture jumping
+  // forward. A second claim on the same bytes gets its OWN element, kept in
+  // the cache under a slot of its own so a warm LOAD reuses it like the first.
+  const claimed = new Set()
   const load = async (src, muted) => {
-    let v = cache.get(src)
-    if (v) return v
+    let key = src
+    let v = cache.get(key)
+    for (let n = 2; v && claimed.has(v); n++) {
+      key = src + '#' + n
+      v = cache.get(key)
+    }
+    if (v) { claimed.add(v); return v }
     let url = src
     if (ctx.data.videoFetchMode === 'blob') {
       try { url = await toBlobUrl(src) }
@@ -6933,7 +7056,8 @@ var SETUP = `async (ctx) => {
       v.onerror = () => rej(new Error('[studio] video failed to load' + (v.error ? ' (' + v.error.code + (v.error.message ? ': ' + v.error.message : '') + ')' : '')))
       v.load()
     })
-    cache.set(src, v)
+    cache.set(key, v)
+    claimed.add(v)
     return v
   }
   // Shots: the "video" is a still image \u2014 drawImage accepts it directly and the
@@ -7377,7 +7501,7 @@ var ON_FRAME = `(ctx, content, dt) => {
   // The card under the playhead: another media's own card fields over the
   // take's frame (resolved at lowering), the take's frame for the primary.
   var cfr = amId && actM && actM.frame ? actM.frame : frame
-  if (r.media) for (var amK in r.media) { var amE = r.media[amK]; if (amK !== amId && amE && amE.pause && amE.paused === false) amE.pause() }
+  if (r.media) for (var amK in r.media) { var amE = r.media[amK]; if (amK !== amId && amE && amE !== video && amE.pause && amE.paused === false) amE.pause() }
   if (amId) {
     if (r.video && r.video.pause && r.video.paused === false) r.video.pause()
     if (r.cam && r.cam.pause && r.cam.paused === false) r.cam.pause()
@@ -8835,8 +8959,9 @@ function studioLayerData(input, duration, pins) {
   };
 }
 function lowerToComposition(input) {
-  const doc = migrateText(migrateMotion(input));
-  const rated = ratedSegments(doc);
+  const read = migrateText(migrateMotion(input));
+  const rated = ratedSegments(read);
+  const doc = resolveOverlayAnchors(read, rated);
   const transitions = docTransitions(doc);
   const footageEnd = durationSec(doc, rated);
   const duration = outputEnd(doc, footageEnd);
@@ -9050,8 +9175,9 @@ function loweredZoomSpans(doc, rated, transitions, layout, camera, zoomStyle) {
   });
 }
 function docZoomTrack(input) {
-  const doc = migrateText(migrateMotion(input));
-  const rated = ratedSegments(doc);
+  const read = migrateText(migrateMotion(input));
+  const rated = ratedSegments(read);
+  const doc = resolveOverlayAnchors(read, rated);
   const transitions = docTransitions(doc);
   const layout = docCardLayout(doc);
   const camera = cameraModel(doc.frame);
@@ -9779,14 +9905,16 @@ import { totalDuration as totalDuration5 } from "@vosjs/timeline";
 
 // src/audioBeds.ts
 import { totalDuration as totalDuration4 } from "@vosjs/timeline";
-var round33 = (v) => Math.round(v * 1e3) / 1e3;
+var round34 = (v) => Math.round(v * 1e3) / 1e3;
 function docOutputDuration(doc) {
-  const footage = totalDuration4(ratedSegments(doc));
-  return isRecordingDoc(doc) ? outputEnd(migrateMotion(doc), footage) : footage;
+  const rated = ratedSegments(doc);
+  const footage = totalDuration4(rated);
+  if (!isRecordingDoc(doc)) return footage;
+  return outputEnd(resolveOverlayAnchors(migrateMotion(doc), rated), footage);
 }
 function musicBedClip(input) {
-  const track = round33(input.trackDuration);
-  const output = round33(input.outputDuration);
+  const track = round34(input.trackDuration);
+  const output = round34(input.outputDuration);
   const clip = {
     id: input.id,
     key: input.key,
@@ -9801,7 +9929,7 @@ function musicBedClip(input) {
     fadeIn: 0,
     // A bed that just stops reads as a glitch; clamp so a very short cut
     // still spends most of its time at full level.
-    fadeOut: output > 0 ? Math.min(1.5, round33(output / 4)) : 1.5,
+    fadeOut: output > 0 ? Math.min(1.5, round34(output / 4)) : 1.5,
     duck: input.hasMic || void 0
   };
   if (output <= 0) return clip;
@@ -9820,28 +9948,28 @@ function isMusicBed(clip, outputDuration) {
   return Math.abs(placed - outputDuration) <= 1;
 }
 function refillAudioBeds(doc, prevDuration, nextDuration) {
-  const EPS2 = 0.05;
-  if (Math.abs(nextDuration - prevDuration) <= EPS2 || nextDuration <= 0) {
+  const EPS3 = 0.05;
+  if (Math.abs(nextDuration - prevDuration) <= EPS3 || nextDuration <= 0) {
     return false;
   }
   let changed = false;
   for (const clip of doc.audio) {
     if (clip.start >= nextDuration) continue;
     const placed = clip.loop ? Math.max(clip.out - clip.in, clip.loopLen ?? clip.out - clip.in) : clip.out - clip.in;
-    if (Math.abs(clip.start + placed - prevDuration) > EPS2) continue;
+    if (Math.abs(clip.start + placed - prevDuration) > EPS3) continue;
     const span = clip.out - clip.in;
-    const nextLen = round33(nextDuration - clip.start);
+    const nextLen = round34(nextDuration - clip.start);
     if (clip.loop) {
       if (nextLen >= span) {
         clip.loopLen = nextLen;
       } else {
         clip.loop = void 0;
         clip.loopLen = void 0;
-        clip.out = round33(clip.in + nextLen);
+        clip.out = round34(clip.in + nextLen);
       }
     } else {
       if (clip.in + nextLen <= clip.duration) {
-        clip.out = round33(clip.in + nextLen);
+        clip.out = round34(clip.in + nextLen);
       } else {
         clip.out = clip.duration;
         clip.loop = true;
@@ -10086,7 +10214,7 @@ function applyTemplate(template, take, opts) {
   const skipped = [];
   for (const clip of template.overlays ?? []) {
     const next = structuredClone(clip);
-    next.start = Math.max(0, round34(clip.start + shift));
+    next.start = Math.max(0, round35(clip.start + shift));
     next.from = from;
     const mine = own.get(clip.id);
     if (next.kind === "text") {
@@ -10115,7 +10243,7 @@ function applyTemplate(template, take, opts) {
   for (const clip of template.objects ?? []) {
     const next = structuredClone(clip);
     if (next.span)
-      next.span.start = Math.max(0, round34(next.span.start + shift));
+      next.span.start = Math.max(0, round35(next.span.start + shift));
     next.from = from;
     objects.push(next);
   }
@@ -10125,7 +10253,7 @@ function applyTemplate(template, take, opts) {
   );
   for (const clip of template.audio ?? []) {
     const next = structuredClone(clip);
-    next.start = Math.max(0, round34(clip.start + shift));
+    next.start = Math.max(0, round35(clip.start + shift));
     next.from = from;
     audio.push(next);
   }
@@ -10146,7 +10274,7 @@ function applyTemplate(template, take, opts) {
   }
   return { doc, notes };
 }
-var round34 = (v) => Math.round(v * 1e3) / 1e3;
+var round35 = (v) => Math.round(v * 1e3) / 1e3;
 
 // src/digest/geometry.ts
 var CROP_MIN_FRAC = 0.25;
@@ -10329,15 +10457,15 @@ function outputRangeToSource(doc, t0, t1) {
     srcOut: mapTime2(rated, Math.max(0, t1))
   };
 }
-var EPS = 1e-6;
+var EPS2 = 1e-6;
 var MIN_REMAINDER = 0.25;
 var MIN_SEGMENT = 0.05;
 function setSpeedInRange(spans, srcIn, srcOut, rate) {
-  if (srcOut - srcIn < EPS) return [...spans];
+  if (srcOut - srcIn < EPS2) return [...spans];
   const kept = [];
   const used = new Set(spans.map((s) => s.id));
   for (const s of spans) {
-    if (s.out <= srcIn + EPS || s.in >= srcOut - EPS) {
+    if (s.out <= srcIn + EPS2 || s.in >= srcOut - EPS2) {
       kept.push(s);
       continue;
     }
@@ -10362,12 +10490,12 @@ function setSpeedInRange(spans, srcIn, srcOut, rate) {
   return kept.sort((a, b) => a.in - b.in);
 }
 function removeSpeedInRange(spans, srcIn, srcOut) {
-  return spans.filter((s) => s.out <= srcIn + EPS || s.in >= srcOut - EPS);
+  return spans.filter((s) => s.out <= srcIn + EPS2 || s.in >= srcOut - EPS2);
 }
 function removeSourceRange(segments, srcIn, srcOut) {
   const next = [];
   for (const seg of segments) {
-    if (seg.out <= srcIn + EPS || seg.in >= srcOut - EPS) {
+    if (seg.out <= srcIn + EPS2 || seg.in >= srcOut - EPS2) {
       next.push(seg);
       continue;
     }
@@ -10379,11 +10507,11 @@ function removeSourceRange(segments, srcIn, srcOut) {
 }
 function zoomSpanForRange(zoom, srcIn, srcOut) {
   let start = srcIn;
-  const covering = zoom.find((z) => z.in <= start + EPS && z.out > start + EPS);
+  const covering = zoom.find((z) => z.in <= start + EPS2 && z.out > start + EPS2);
   if (covering) start = covering.out;
   let end = srcOut;
   for (const z of zoom) {
-    if (z.in >= start - EPS && z.in < end) end = z.in;
+    if (z.in >= start - EPS2 && z.in < end) end = z.in;
   }
   if (end - start < ZOOM_SPAN_MIN) return null;
   const used = new Set(zoom.map((z) => z.id));
@@ -10792,7 +10920,7 @@ function applyLook(frame, look, size, video, placement) {
 import {
   mapTime as mapTime3,
   removeSegment,
-  segmentRate as segmentRate3,
+  segmentRate as segmentRate4,
   sourceToTimeline as sourceToTimeline2,
   splitBySpeed as splitBySpeed4,
   totalDuration as totalDuration7,
@@ -11533,7 +11661,7 @@ var micLane = {
 var spanDefaultLen = (sourceDuration) => Math.max(1, sourceDuration * 0.05);
 function rateAt(rated, srcT) {
   for (const p of rated)
-    if (srcT >= p.in - 1e-9 && srcT < p.out + 1e-9) return segmentRate3(p);
+    if (srcT >= p.in - 1e-9 && srcT < p.out + 1e-9) return segmentRate4(p);
   return 1;
 }
 function clampToKept(kept, newIn, len) {
@@ -11563,7 +11691,7 @@ var speedLane = {
       let start = null;
       let end = 0;
       for (const p of rated) {
-        const len = Math.max(0, p.out - p.in) / segmentRate3(p);
+        const len = Math.max(0, p.out - p.in) / segmentRate4(p);
         if (p.rate === sp.rate && p.in >= sp.in - 1e-9 && p.out <= sp.out + 1e-9) {
           if (start === null) start = acc;
           end = acc + len;
@@ -12193,6 +12321,7 @@ export {
   DRAG_FIT_LEVEL,
   DRAG_MIN_S,
   DRAG_MIN_TRAVEL_FRAC,
+  ELAPSED_PLACEHOLDER,
   END_CARD_FROM,
   END_CARD_RECEDE,
   END_CARD_SECONDS,
@@ -12303,6 +12432,7 @@ export {
   ambientDrift,
   anchorKindOf,
   anchorSourceDuration,
+  anchoredClip,
   animStep,
   applyLook,
   applyTemplate,
@@ -12379,6 +12509,7 @@ export {
   dropTemplate,
   duckCurve,
   effectiveSegments,
+  elapsedFor,
   endCardClips,
   enterKey,
   enterOf,
@@ -12398,9 +12529,11 @@ export {
   focusBounds,
   focusForViewportCentre,
   followFocusEvents,
+  formatElapsed,
   frameGeometry,
   freezeLane,
   freezeOutputExtents,
+  hasElapsed,
   hexToRgb,
   hexToRgbTriplet,
   houseLook,
@@ -12516,7 +12649,9 @@ export {
   removeSourceRange,
   removeSpeedInRange,
   replaceRange,
+  resolveAnchor,
   resolveExportSize,
+  resolveOverlayAnchors,
   resolveOverlayBox,
   resolveOverlayStyle,
   resolvePins,
@@ -12540,8 +12675,10 @@ export {
   smoothCursor,
   snapOffset,
   snapRunWeight,
+  sourceMomentToOutput,
   spanOutputExtent,
   speedLane,
+  stepElapsedMs,
   studioAudioPlan,
   studioEntry,
   studioLayerData,