termcut 0.6.4 → 0.7.0

package/src/video.ts

@@ -3,8 +3,8 @@ import path from "node:path";
 import { readCast, writeCast } from "./cast";
 import { applyOverrides, resolveConfig } from "./config";
 import { record } from "./recorder";
-import { renderOutputs, type RenderResult } from "./render";
-import type { CastEvent, RecordOptions, Recording, RenderOptions, ResolvedConfig, Script, VideoConfig } from "./types";
+import { renderSelection, type RenderResult } from "./render";
+import type { CastEvent, ClipSelection, RecordOptions, Recording, RenderOptions, ResolvedConfig, Script, VideoConfig } from "./types";
 
 export interface VideoRecordOptions extends RecordOptions {
   /** Re-record even if a cached cast matches. */
@@ -69,8 +69,7 @@ export class Video {
     if (!(await file.exists())) return undefined;
     const hasher = new Bun.CryptoHasher("sha256");
     hasher.update(await file.arrayBuffer());
-    const subset: Record<string, unknown> = {};
-    for (const key of RECORD_KEYS) subset[key] = this.config[key];
+    const subset = Object.fromEntries(RECORD_KEYS.map((key) => [key, this.config[key]]));
     hasher.update(JSON.stringify(subset));
     return hasher.digest("hex");
   }
@@ -113,7 +112,7 @@ export class Video {
   async render(recording?: Recording, opts: RenderOptions = {}): Promise<RenderResult> {
     const rec = recording ?? (await readCast(this.config.cast));
     const config = applyOverrides(this.config, opts.overrides);
-    return renderOutputs(rec, config, opts.onProgress);
+    return renderSelection(rec, config, opts.clip, opts.onProgress);
   }
 
   async run(opts: RunOptions = {}): Promise<RunResult> {
@@ -132,8 +131,9 @@ export function defineVideo(config: VideoConfig, script: Script): Video {
   return new Video(config, script);
 }
 
-export function isVideo(value: unknown): value is Video {
-  return typeof value === "object" && value !== null && (value as { __bunVideo?: unknown }).__bunVideo === true;
+/** True for a `defineVideo()` result — checked by brand, so a Video built by another copy of tcut still counts. */
+export function isVideo<T>(value: T): value is T & Video {
+  return value instanceof Object && "__bunVideo" in value && value.__bunVideo === true;
 }
 
 /** Render an existing .cast file (from tcut or asciinema) with the given settings. */
@@ -141,11 +141,14 @@ export async function renderCast(
   castFile: string,
   overrides: Partial<VideoConfig> & { output?: string | string[] },
   onProgress?: RenderOptions["onProgress"],
+  clip?: ClipSelection,
 ): Promise<RenderResult> {
   const rec = await readCast(castFile);
-  const base =
-    rec.header.bunVideo ??
-    resolveConfig({ output: overrides.output ?? castFile.replace(/\.cast$/, "") + ".mp4", cols: rec.header.width, rows: rec.header.height });
-  const config = applyOverrides(base, overrides);
-  return renderOutputs(rec, config, onProgress);
+  const config = applyOverrides(castConfig(rec, castFile, overrides.output), overrides);
+  return renderSelection(rec, config, clip, onProgress);
+}
+
+/** The config a cast should be rendered with: the one recorded in its header, or sensible defaults for foreign casts. */
+export function castConfig(rec: Recording, castFile: string, output?: string | string[]): ResolvedConfig {
+  return rec.header.bunVideo ?? resolveConfig({ output: output ?? castFile.replace(/\.cast$/, "") + ".mp4", cols: rec.header.width, rows: rec.header.height });
 }