@vosjs/cli 0.65.4 → 0.67.0

package/dist/{chunk-IDPTF5PP.js → chunk-XCWC7SUS.js}

@@ -9,7 +9,7 @@ import {
   reencodeStill,
   renderStill,
   videoFormat
-} from "./chunk-TYGDQEEI.js";
+} from "./chunk-MDRYSHOF.js";
 import {
   PREV_DOC_NAME,
   RECORDING_NAME,
@@ -33,7 +33,7 @@ import {
   uploadDocRefs,
   uploadManifest,
   writeJson
-} from "./chunk-63KINQOJ.js";
+} from "./chunk-OFTRK3Y3.js";
 import {
   CREDENTIALS_PATH,
   MEDIA_HEAD_BYTES,
@@ -56,6 +56,7 @@ import {
   parseVosId,
   platformOrigin,
   programAssets,
+  promptHint,
   readSyncState,
   requireCredential,
   resolveCredential,
@@ -65,7 +66,7 @@ import {
   strFlag,
   writeCredential,
   writeSyncState
-} from "./chunk-UQLC4BEZ.js";
+} from "./chunk-C5VKACGQ.js";
 import {
   deadLine,
   deadWarns
@@ -214,7 +215,12 @@ import {
   pinCandidates,
   pinRectOnScreen,
   pinReferent,
-  parseEmphasis,
+  marksEmphasis,
+  migrateTextClip,
+  plainText,
+  resolveOverlayStyle,
+  snapRunWeight,
+  RUN_STYLE_KEYS,
   ratedSegments,
   recommendedExportResolution,
   resolvePins,
@@ -244,7 +250,7 @@ function wordsOf(text) {
   return text.toLowerCase().split(/[^a-z0-9]+/).filter((x) => x.length >= 3 && !LABEL_STOPWORDS.has(x));
 }
 function layerWords(o) {
-  const src = typeof o.html === "string" ? o.html.replace(/<[^>]*>/g, " ") : typeof o.text === "string" ? o.text : "";
+  const src = typeof o.html === "string" ? o.html.replace(/<[^>]*>/g, " ") : typeof o.text === "string" || Array.isArray(o.text) ? plainText(o.text) : "";
   return new Set(wordsOf(src));
 }
 function selectorLabelWords(selector) {
@@ -1063,28 +1069,75 @@ function lintDoc(docIn) {
     }
     checkPin(o, name, docIn, recording, problems, warnings);
     if (o.kind === "text") {
-      if (typeof o.text !== "string")
-        problems.push(`${name}.text must be a string`);
+      if (Array.isArray(o.text)) {
+        const HINTS = {
+          bold: "weight: 700",
+          fontWeight: "weight",
+          strikethrough: "strike: true",
+          background: "highlight",
+          colour: "color"
+        };
+        o.text.forEach((run2, ri) => {
+          const at2 = `${name}.text[${ri}]`;
+          if (!run2 || typeof run2 !== "object" || Array.isArray(run2)) {
+            problems.push(
+              `${at2} must be a run: { text, weight?, italic?, color?, underline?, strike?, highlight? }`
+            );
+            return;
+          }
+          const r = run2;
+          if (typeof r.text !== "string")
+            problems.push(`${at2}.text must be a string`);
+          else if (!r.text)
+            warnings.push(`${at2} has no text and paints nothing; drop it`);
+          for (const k of Object.keys(r)) {
+            if (k === "text" || RUN_STYLE_KEYS.includes(k))
+              continue;
+            problems.push(
+              `${at2}.${k} is not a run field (${RUN_STYLE_KEYS.join(", ")})${HINTS[k] ? `: write ${HINTS[k]}` : ""}`
+            );
+          }
+          if (r.weight !== void 0 && (!isNum(r.weight) || r.weight < 100 || r.weight > 900))
+            problems.push(`${at2}.weight must be 100..900`);
+          for (const k of ["italic", "underline", "strike"]) {
+            if (r[k] !== void 0 && typeof r[k] !== "boolean")
+              problems.push(`${at2}.${k} must be true or false`);
+          }
+          for (const k of ["color", "highlight"]) {
+            if (r[k] !== void 0 && typeof r[k] !== "string")
+              problems.push(`${at2}.${k} must be a CSS colour`);
+          }
+          if (isNum(r.weight) && r.weight >= 100 && r.weight <= 900) {
+            const layer = o;
+            const own = resolveOverlayStyle({ ...layer, text: "" }).weight;
+            if (r.weight !== own && snapRunWeight(layer, r.weight) === own)
+              warnings.push(
+                `${at2}.weight ${r.weight} paints no differently: the layer's family hosts no weight nearer to it than the layer's own ${own}`
+              );
+          }
+        });
+      } else if (typeof o.text !== "string") {
+        problems.push(
+          `${name}.text must be a string, or a list of runs ([{ text, weight?, italic?, color?, underline?, strike?, highlight? }])`
+        );
+      }
       if (typeof o.preset === "string" && !PRESETS.includes(o.preset)) {
         warnings.push(
           `${name}.preset "${String(o.preset)}" is not a known preset (${PRESETS.join("|")}) \u2014 falls back to "title"`
         );
       }
-      if (o.emphasis !== void 0) {
-        const em = o.emphasis;
-        if (!em || typeof em !== "object" || Array.isArray(em)) {
-          problems.push(
-            `${name}.emphasis must be { weight?, color? } ({} turns *markers* on)`
-          );
-        } else {
-          if (em.weight !== void 0 && (!isNum(em.weight) || em.weight < 100 || em.weight > 900))
-            problems.push(`${name}.emphasis.weight must be 100..900`);
-          if (em.color !== void 0 && typeof em.color !== "string")
-            problems.push(`${name}.emphasis.color must be a CSS colour`);
-        }
-      } else if (typeof o.text === "string" && parseEmphasis(o.text) !== null) {
+      if (o.emphasis !== void 0 && typeof o.text === "string") {
+        const runs = migrateTextClip(o).text;
+        warnings.push(
+          `${name}.emphasis is retired (styled words are runs now, with no markers in the text). It is still read, but write it as: "text": ${JSON.stringify(runs)} and drop "emphasis"`
+        );
+      } else if (typeof o.text === "string" && marksEmphasis(o.text)) {
+        const runs = migrateTextClip({
+          ...o,
+          emphasis: {}
+        }).text;
         warnings.push(
-          `${name}.text has *marked* words but no emphasis, so the asterisks show as typed; add emphasis: {} to set them bold (\\* keeps one literal)`
+          `${name}.text has words between asterisks, which show as typed. To set them bold write runs: "text": ${JSON.stringify(runs)}`
         );
       }
       if (o.size !== void 0 && (!isNum(o.size) || o.size < 12 || o.size > 200)) {
@@ -4333,8 +4386,9 @@ import {
   computeCardLayout,
   docStillTime as docStillTime2,
   migrateHostedDoc,
+  overlayPlainText,
   overlayRect,
-  resolveOverlayStyle
+  resolveOverlayStyle as resolveOverlayStyle2
 } from "@vosjs/studio-core";
 var POSTER_CLASSES = [
   "landscape",
@@ -4453,7 +4507,7 @@ function posterTextBoxes(doc, px, time) {
     if (clip.kind !== "text") continue;
     if (time < clip.start || time > clip.start + clip.duration) continue;
     const rect = overlayRect(clip, estimateWidth, W, H);
-    const style = resolveOverlayStyle(clip);
+    const style = resolveOverlayStyle2(clip);
     const r3 = (v) => Math.round(v * 1e3) / 1e3;
     out.push({
       x: r3((rect.cx - rect.w / 2) / W),
@@ -4461,7 +4515,7 @@ function posterTextBoxes(doc, px, time) {
       w: r3(rect.w / W),
       h: r3(rect.h / H),
       role: clip.preset === "title" ? "headline" : "body",
-      label: clip.text.split("\n")[0].slice(0, 40),
+      label: overlayPlainText(clip).split("\n")[0].slice(0, 40),
       .../^#[0-9a-f]{6}$/i.test(style.color) ? { color: style.color } : {}
     });
   }
@@ -7308,7 +7362,8 @@ async function pushTake(dir, flags, r) {
         client: clientId(),
         ...folderId ? { folderId } : {},
         ...flags.label ? { label: flags.label } : {},
-        ...flags.note ? { note: flags.note } : {}
+        ...flags.note ? { note: flags.note } : {},
+        ...flags.prompt ? { prompt: flags.prompt } : {}
       }
     });
     if (created.status !== 201) {
@@ -7359,6 +7414,16 @@ async function pushTake(dir, flags, r) {
     );
   }
   serverWarnings(pushed.json, (l) => r.log(l));
+  if (flags.prompt) {
+    const set = await api(ctx, `/vos/${state.vosId}`, {
+      method: "PATCH",
+      body: { prompt: flags.prompt }
+    });
+    if (set.status !== 200)
+      r.warn(
+        `could not set the prompt (${set.status}): ${String(set.json.error ?? "")}${detailLine(set.json)}`
+      );
+  }
   const version = pushed.json.version;
   writeSyncState(dir, {
     vosId: state.vosId,
@@ -8261,6 +8326,8 @@ ${landedLines(landed2)}` : "")
       currentVersionId: created.currentVersionId,
       watchUrl,
       studioUrl,
+      prompt: prompt ?? null,
+      ...prompt ? {} : { promptHint: promptHint(source, created.id) },
       ...landed ? {
         still: landed.still,
         thumbnailUrl: landed.thumbnailUrl,
@@ -8273,7 +8340,9 @@ ${landedLines(landed2)}` : "")
 ` + (landed ? `${landedLines(landed)}
 ` : "") + `  shelf:  ${folderRef ? `in ${folderRef}` : `unfiled, at the root of your shelf (file it: vos folder move ${created.id} --to <slug>)`}
   cover:  ${typeof programDoc?.still === "number" ? `${String(programDoc.still)}s` : "the platform picks an early frame; choose one with --still <seconds>"}
-Iterate with: vos push ${source} --vos ${created.id}`
+` + (prompt ? `  prompt: shown on the watch page
+` : `  prompt: none shown; show the one that made it: ${promptHint(source, created.id)}
+`) + `Iterate with: vos push ${source} --vos ${created.id}`
   );
   return EXIT_OK;
 }
@@ -14729,7 +14798,7 @@ async function cmdPush3(argv) {
   const dir = positionals[0];
   if (!dir)
     throw new UsageError(
-      "vos push <take> [--vos|--title|--label|--note|--folder|--override|--yes|--key|--api]"
+      "vos push <take> [--vos|--title|--label|--note|--prompt|--folder|--override|--yes|--key|--api]"
     );
   const refusal = takePushRefusal({
     vos: strFlag(flags, "vos"),
@@ -14753,7 +14822,8 @@ async function cmdPush3(argv) {
       label: strFlag(flags, "label"),
       note: strFlag(flags, "note"),
       folder: strFlag(flags, "folder"),
-      overrides
+      overrides,
+      prompt: strFlag(flags, "prompt")
     },
     r
   );
@@ -14770,9 +14840,12 @@ async function cmdPush3(argv) {
   }) : null;
   const filed = result.versionNumber === 1 ? `
   shelf:  ${strFlag(flags, "folder") ? `in ${strFlag(flags, "folder")}` : `unfiled, at the root of your shelf (file it: vos folder move ${result.vosId} --to <slug>)`}` : "";
+  const prompt = strFlag(flags, "prompt");
+  const hint = result.versionNumber === 1 && !prompt ? promptHint(dir, result.vosId) : null;
   r.done(
     {
       ...result,
+      ...hint ? { promptHint: hint } : {},
       ...landed ? {
         still: landed.still,
         thumbnailUrl: landed.thumbnailUrl,
@@ -14781,7 +14854,8 @@ async function cmdPush3(argv) {
     },
     `pushed v${result.versionNumber} \u2192 vos ${result.vosId}
   review: ${pushedTo}/vos/${result.vosId}
-  studio: ${pushedTo}/studio?vos=${result.vosId}` + filed + (landed ? `
+  studio: ${pushedTo}/studio?vos=${result.vosId}` + filed + (hint ? `
+  prompt: none shown; show the one that made it: ${hint}` : "") + (landed ? `
 ${landedLines(landed)}` : "")
   );
   return EXIT_OK;
@@ -15093,4 +15167,4 @@ export {
   verbHelp,
   run
 };
-//# sourceMappingURL=chunk-IDPTF5PP.js.map
+//# sourceMappingURL=chunk-XCWC7SUS.js.map