@vosjs/studio-core 0.6.0 → 0.7.1

package/dist/index.d.ts

@@ -922,6 +922,15 @@ interface EndCard {
     headline?: string;
     sub?: string;
     wordmark?: string;
+    /**
+     * The brand's MARK as an image (a take-dir path or a URL the render page
+     * can load), with its aspect (width over height), drawn above the
+     * wordmark; a wide mark (a stylised wordmark asset) stands alone.
+     */
+    mark?: {
+        key: string;
+        aspect: number;
+    };
     /**
      * The words' colour (any CSS colour). The house presets are white for
      * footage; over a light plate the brand's ink is what reads. Absent =

package/dist/index.js

@@ -1813,7 +1813,11 @@ var STUDIO_SETUP = `async (ctx) => {
   if (olv && olv.length && typeof FontFace !== 'undefined') {
     try {
       const faces = ctx.data.overlayFonts || ${JSON.stringify(OVERLAY_FONT_FACES)}
+      // Mark what SETUP registers, so ON_FRAME's live path (a text overlay
+      // arriving through SET_DATA) never adds the same face twice.
+      const ofSet = window.__voilaFontSet || (window.__voilaFontSet = {})
       const loads = faces.map((f) => {
+        ofSet[f.family + '|' + f.weight] = 1
         const ff = new FontFace(f.family, 'url(' + f.url + ')', { weight: String(f.weight) })
         document.fonts.add(ff)
         return ff.load()
@@ -2273,20 +2277,37 @@ var STUDIO_FRAME = `(ctx, content, dt) => {
       continue
     }
     var olPx = ol.fs * olMS * s
-    // Live style edits: SET_DATA never re-runs SETUP, so an override face
-    // arriving mid-session lazy-loads here (fail-open; frames repaint as it
-    // lands). Cold loads (export) awaited the full list in SETUP already.
-    if (ol.face && typeof FontFace !== 'undefined') {
+    // Faces arriving LIVE: SET_DATA never re-runs SETUP, so the first text
+    // overlay a session gains registers the house faces here (a title added
+    // to a fresh document used to paint in the stack's system fallback until
+    // the next cold load), and an override face lazy-loads the same way.
+    // Keyed per window, so SETUP's cold-load faces and repeat frames never
+    // re-register; fail-open, frames repaint as each face lands.
+    if (typeof FontFace !== 'undefined') {
       var ofSet = window.__voilaFontSet || (window.__voilaFontSet = {})
-      var ofKey = ol.face.f + '|' + ol.face.w
-      if (!ofSet[ofKey]) {
-        ofSet[ofKey] = 1
+      var ofBase = d.overlayFonts || ${JSON.stringify(OVERLAY_FONT_FACES)}
+      for (var ofi = 0; ofi < ofBase.length; ofi++) {
+        var ofB = ofBase[ofi]
+        var ofBK = ofB.family + '|' + ofB.weight
+        if (ofSet[ofBK]) continue
+        ofSet[ofBK] = 1
         try {
-          var ofFace = new FontFace(ol.face.f, 'url(' + ol.face.u + ')', { weight: String(ol.face.w) })
-          document.fonts.add(ofFace)
-          ofFace.load().catch(function () {})
+          var ofBF = new FontFace(ofB.family, 'url(' + ofB.url + ')', { weight: String(ofB.weight) })
+          document.fonts.add(ofBF)
+          ofBF.load().catch(function () {})
         } catch (e) {}
       }
+      if (ol.face) {
+        var ofKey = ol.face.f + '|' + ol.face.w
+        if (!ofSet[ofKey]) {
+          ofSet[ofKey] = 1
+          try {
+            var ofFace = new FontFace(ol.face.f, 'url(' + ol.face.u + ')', { weight: String(ol.face.w) })
+            document.fonts.add(ofFace)
+            ofFace.load().catch(function () {})
+          } catch (e) {}
+        }
+      }
     }
     ovC.save()
     ovC.globalAlpha = olA
@@ -2859,8 +2880,37 @@ function expandEndCard(doc, outputDuration) {
     clips.push(text("endcard-title", card.headline.trim(), "title", 0.44, 0.35));
   if (card.sub?.trim())
     clips.push(text("endcard-sub", card.sub.trim(), "caption", 0.57, 0.5));
-  if (card.wordmark?.trim())
-    clips.push(text("endcard-mark", card.wordmark.trim(), "label", 0.88, 0.65));
+  const mark = card.mark;
+  const wide = !!mark && mark.aspect > 2.2;
+  if (mark && mark.key) {
+    const size = resolveExportSize(doc);
+    const designW = 1080 * size.width / Math.max(1, size.height);
+    const hPx = wide ? 44 : 30;
+    const clip = {
+      id: "endcard-markimg",
+      kind: "image",
+      key: mark.key,
+      width: Math.min(0.9, hPx * Math.max(0.2, mark.aspect) / designW),
+      radius: 0,
+      shadow: "none",
+      start: endStart + 0.65,
+      duration: Math.max(0.3, seconds - 0.65),
+      transform: { x: 0.5, y: wide ? 0.88 : 0.835, scale: 1, rotation: 0 },
+      enter: "rise",
+      exit: "none"
+    };
+    clips.push(clip);
+  }
+  if (card.wordmark?.trim() && !wide)
+    clips.push(
+      text(
+        "endcard-mark",
+        card.wordmark.trim(),
+        "label",
+        mark && mark.key ? 0.895 : 0.88,
+        0.65
+      )
+    );
   const overlays = [...doc.overlays ?? [], ...clips];
   return { doc: { ...doc, segments, overlays }, endStart, seconds };
 }