@argo-video/cli 0.1.1 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/asset-server.d.ts.map +1 -1
- package/dist/asset-server.js +4 -1
- package/dist/asset-server.js.map +1 -1
- package/dist/config.d.ts +6 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +2 -0
- package/dist/config.js.map +1 -1
- package/dist/export.d.ts +1 -0
- package/dist/export.d.ts.map +1 -1
- package/dist/export.js +8 -6
- package/dist/export.js.map +1 -1
- package/dist/fixtures.d.ts.map +1 -1
- package/dist/fixtures.js +14 -1
- package/dist/fixtures.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/narration.d.ts +23 -0
- package/dist/narration.d.ts.map +1 -1
- package/dist/narration.js +59 -0
- package/dist/narration.js.map +1 -1
- package/dist/overlays/index.d.ts +7 -2
- package/dist/overlays/index.d.ts.map +1 -1
- package/dist/overlays/index.js +16 -5
- package/dist/overlays/index.js.map +1 -1
- package/dist/overlays/templates.d.ts +2 -1
- package/dist/overlays/templates.d.ts.map +1 -1
- package/dist/overlays/templates.js +28 -24
- package/dist/overlays/templates.js.map +1 -1
- package/dist/overlays/types.d.ts +4 -0
- package/dist/overlays/types.d.ts.map +1 -1
- package/dist/overlays/types.js.map +1 -1
- package/dist/overlays/zones.d.ts +8 -0
- package/dist/overlays/zones.d.ts.map +1 -1
- package/dist/overlays/zones.js +48 -0
- package/dist/overlays/zones.js.map +1 -1
- package/dist/pipeline.d.ts +1 -1
- package/dist/pipeline.d.ts.map +1 -1
- package/dist/pipeline.js +18 -2
- package/dist/pipeline.js.map +1 -1
- package/dist/record.d.ts +1 -0
- package/dist/record.d.ts.map +1 -1
- package/dist/record.js +14 -4
- package/dist/record.js.map +1 -1
- package/dist/tts/align.d.ts +9 -0
- package/dist/tts/align.d.ts.map +1 -1
- package/dist/tts/align.js +28 -15
- package/dist/tts/align.js.map +1 -1
- package/dist/tts/generate.d.ts +1 -0
- package/dist/tts/generate.d.ts.map +1 -1
- package/dist/tts/generate.js +4 -1
- package/dist/tts/generate.js.map +1 -1
- package/dist/tts/kokoro.d.ts +21 -4
- package/dist/tts/kokoro.d.ts.map +1 -1
- package/dist/tts/kokoro.js +27 -7
- package/dist/tts/kokoro.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-server.d.ts","sourceRoot":"","sources":["../src/asset-server.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B;AAaD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"asset-server.d.ts","sourceRoot":"","sources":["../src/asset-server.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B;AAaD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CA8DvE"}
|
package/dist/asset-server.js
CHANGED
|
@@ -13,7 +13,7 @@ const MIME_TYPES = {
|
|
|
13
13
|
};
|
|
14
14
|
export function startAssetServer(assetDir) {
|
|
15
15
|
const resolvedDir = resolve(assetDir);
|
|
16
|
-
return new Promise((resolvePromise) => {
|
|
16
|
+
return new Promise((resolvePromise, rejectPromise) => {
|
|
17
17
|
const server = http.createServer((req, res) => {
|
|
18
18
|
const rawUrl = req.url ?? '/';
|
|
19
19
|
const urlPath = decodeURIComponent(rawUrl);
|
|
@@ -53,6 +53,9 @@ export function startAssetServer(assetDir) {
|
|
|
53
53
|
res.writeHead(200, { 'Content-Type': contentType });
|
|
54
54
|
createReadStream(filePath).pipe(res);
|
|
55
55
|
});
|
|
56
|
+
server.on('error', (err) => {
|
|
57
|
+
rejectPromise(new Error(`Asset server failed to start: ${err.message}`));
|
|
58
|
+
});
|
|
56
59
|
server.listen(0, '127.0.0.1', () => {
|
|
57
60
|
const { port } = server.address();
|
|
58
61
|
resolvePromise({
|
package/dist/asset-server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-server.js","sourceRoot":"","sources":["../src/asset-server.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AASjE,MAAM,UAAU,GAA2B;IACzC,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,YAAY;IACrB,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,eAAe;IACvB,OAAO,EAAE,YAAY;IACrB,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,kBAAkB;CAC5B,CAAC;AAEF,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEtC,OAAO,IAAI,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"asset-server.js","sourceRoot":"","sources":["../src/asset-server.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
|
@@ -14,6 +14,9 @@ export interface ExportConfig {
|
|
|
14
14
|
preset: string;
|
|
15
15
|
crf: number;
|
|
16
16
|
}
|
|
17
|
+
export interface OverlayConfig {
|
|
18
|
+
autoBackground: boolean;
|
|
19
|
+
}
|
|
17
20
|
export interface ArgoConfig {
|
|
18
21
|
baseURL?: string;
|
|
19
22
|
demosDir: string;
|
|
@@ -21,11 +24,13 @@ export interface ArgoConfig {
|
|
|
21
24
|
tts: TTSConfig;
|
|
22
25
|
video: VideoConfig;
|
|
23
26
|
export: ExportConfig;
|
|
27
|
+
overlays: OverlayConfig;
|
|
24
28
|
}
|
|
25
|
-
export type UserConfig = Partial<Omit<ArgoConfig, 'tts' | 'video' | 'export'> & {
|
|
29
|
+
export type UserConfig = Partial<Omit<ArgoConfig, 'tts' | 'video' | 'export' | 'overlays'> & {
|
|
26
30
|
tts: Partial<TTSConfig>;
|
|
27
31
|
video: Partial<VideoConfig>;
|
|
28
32
|
export: Partial<ExportConfig>;
|
|
33
|
+
overlays: Partial<OverlayConfig>;
|
|
29
34
|
}>;
|
|
30
35
|
export declare function defineConfig(userConfig: UserConfig): ArgoConfig;
|
|
31
36
|
export declare function demosProject(options: {
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,YAAY,EAAE,SAAS,EAAE,CAAC;AAI1B,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,SAAS,CAAC;IACf,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,YAAY,EAAE,SAAS,EAAE,CAAC;AAI1B,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,aAAa;IAC5B,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,SAAS,CAAC;IACf,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,YAAY,CAAC;IACrB,QAAQ,EAAE,aAAa,CAAC;CACzB;AAED,MAAM,MAAM,UAAU,GAAG,OAAO,CAC9B,IAAI,CAAC,UAAU,EAAE,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,CAAC,GAAG;IAC1D,GAAG,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5B,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;CAClC,CACF,CAAC;AAeF,wBAAgB,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU,CAS/D;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;;;;;;;;EAUA;AAkBD,wBAAsB,UAAU,CAC9B,GAAG,EAAE,MAAM,EACX,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,CAAC,CA0BrB"}
|
package/dist/config.js
CHANGED
|
@@ -8,6 +8,7 @@ const DEFAULTS = {
|
|
|
8
8
|
tts: { defaultVoice: 'af_heart', defaultSpeed: 1.0 },
|
|
9
9
|
video: { width: 1920, height: 1080, fps: 30 },
|
|
10
10
|
export: { preset: 'slow', crf: 16 },
|
|
11
|
+
overlays: { autoBackground: false },
|
|
11
12
|
};
|
|
12
13
|
// ---- Functions ----
|
|
13
14
|
export function defineConfig(userConfig) {
|
|
@@ -17,6 +18,7 @@ export function defineConfig(userConfig) {
|
|
|
17
18
|
tts: { ...DEFAULTS.tts, ...userConfig.tts },
|
|
18
19
|
video: { ...DEFAULTS.video, ...userConfig.video },
|
|
19
20
|
export: { ...DEFAULTS.export, ...userConfig.export },
|
|
21
|
+
overlays: { ...DEFAULTS.overlays, ...userConfig.overlays },
|
|
20
22
|
};
|
|
21
23
|
}
|
|
22
24
|
export function demosProject(options) {
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/export.d.ts
CHANGED
package/dist/export.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../src/export.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../src/export.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAMD;;;GAGG;AACH,wBAAgB,WAAW,IAAI,OAAO,CAYrC;AAED;;GAEG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAqEzE"}
|
package/dist/export.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { execFileSync, spawnSync } from 'node:child_process';
|
|
2
2
|
import { existsSync, mkdirSync } from 'node:fs';
|
|
3
3
|
import { join } from 'node:path';
|
|
4
|
+
function formatSeconds(ms) {
|
|
5
|
+
return (ms / 1000).toFixed(3).replace(/\.?0+$/, '');
|
|
6
|
+
}
|
|
4
7
|
/**
|
|
5
8
|
* Check whether ffmpeg is available on the system PATH.
|
|
6
9
|
* Returns true if found, throws with install instructions otherwise.
|
|
@@ -21,7 +24,7 @@ export function checkFfmpeg() {
|
|
|
21
24
|
* Export a demo to MP4 by combining the screen recording with aligned narration audio.
|
|
22
25
|
*/
|
|
23
26
|
export async function exportVideo(options) {
|
|
24
|
-
const { demoName, argoDir, outputDir, preset = 'slow', crf = 16, fps, } = options;
|
|
27
|
+
const { demoName, argoDir, outputDir, preset = 'slow', crf = 16, fps, tailPadMs, } = options;
|
|
25
28
|
checkFfmpeg();
|
|
26
29
|
const demoDir = join(argoDir, demoName);
|
|
27
30
|
const videoPath = join(demoDir, 'video.webm');
|
|
@@ -39,12 +42,11 @@ export async function exportVideo(options) {
|
|
|
39
42
|
const args = [
|
|
40
43
|
'-i', videoPath,
|
|
41
44
|
'-i', audioPath,
|
|
42
|
-
'-c:v', 'libx264',
|
|
43
|
-
'-preset', preset,
|
|
44
|
-
'-crf', String(crf),
|
|
45
|
-
'-c:a', 'aac',
|
|
46
|
-
'-b:a', '192k',
|
|
47
45
|
];
|
|
46
|
+
if (tailPadMs && tailPadMs > 0) {
|
|
47
|
+
args.push('-vf', `tpad=stop_mode=clone:stop_duration=${formatSeconds(tailPadMs)}`);
|
|
48
|
+
}
|
|
49
|
+
args.push('-c:v', 'libx264', '-preset', preset, '-crf', String(crf), '-c:a', 'aac', '-b:a', '192k');
|
|
48
50
|
if (fps !== undefined) {
|
|
49
51
|
args.push('-r', String(fps));
|
|
50
52
|
}
|
package/dist/export.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export.js","sourceRoot":"","sources":["../src/export.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"export.js","sourceRoot":"","sources":["../src/export.ts"],"names":[],"mappings":"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"}
|
package/dist/fixtures.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../src/fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../src/fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,KAAK,eAAe,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,iBAAiB,CAAC;AAI5D,wBAAgB,sBAAsB,CAAC,OAAO,GAAE,eAAgC,IAE5E,UAAU,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,KAAK,CAAC,QAAQ,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,EACnD,UAAU;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,mBAU9B;AAED,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,SAAK,GACT,OAAO,CAAC,IAAI,CAAC,CAEf;AAYD,eAAO,MAAM,IAAI;eAA4B,iBAAiB;wGAe5D,CAAC;AAEH,OAAO,EAAE,MAAM,EAAE,CAAC"}
|
package/dist/fixtures.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { test as base, expect } from '@playwright/test';
|
|
2
|
+
import { readFileSync, existsSync } from 'node:fs';
|
|
2
3
|
import { NarrationTimeline } from './narration.js';
|
|
3
4
|
const defaultFactory = () => new NarrationTimeline();
|
|
4
5
|
export function createNarrationFixture(factory = defaultFactory) {
|
|
@@ -16,9 +17,21 @@ export function createNarrationFixture(factory = defaultFactory) {
|
|
|
16
17
|
export async function demoType(page, selector, text, delay = 60) {
|
|
17
18
|
await page.locator(selector).pressSequentially(text, { delay });
|
|
18
19
|
}
|
|
20
|
+
function loadSceneDurations() {
|
|
21
|
+
const durationsPath = process.env.ARGO_SCENE_DURATIONS_PATH;
|
|
22
|
+
if (!durationsPath || !existsSync(durationsPath))
|
|
23
|
+
return undefined;
|
|
24
|
+
try {
|
|
25
|
+
return JSON.parse(readFileSync(durationsPath, 'utf-8'));
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
19
31
|
export const test = base.extend({
|
|
20
32
|
narration: async ({}, use, testInfo) => {
|
|
21
|
-
const
|
|
33
|
+
const durations = loadSceneDurations();
|
|
34
|
+
const timeline = new NarrationTimeline(durations);
|
|
22
35
|
timeline.start();
|
|
23
36
|
try {
|
|
24
37
|
await use(timeline);
|
package/dist/fixtures.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixtures.js","sourceRoot":"","sources":["../src/fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAInD,MAAM,cAAc,GAAoB,GAAG,EAAE,CAAC,IAAI,iBAAiB,EAAE,CAAC;AAEtE,MAAM,UAAU,sBAAsB,CAAC,UAA2B,cAAc;IAC9E,OAAO,KAAK,EACV,QAAiC,EACjC,GAAmD,EACnD,QAA2B,EAC3B,EAAE;QACF,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACzC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC;gBAAS,CAAC;YACT,MAAM,QAAQ,CAAC,KAAK,CAAC,aAAa,QAAQ,CAAC,KAAK,OAAO,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,IAAU,EACV,QAAgB,EAChB,IAAY,EACZ,KAAK,GAAG,EAAE;IAEV,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAmC;IAChE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE;QACrC,MAAM,QAAQ,GAAG,IAAI,iBAAiB,
|
|
1
|
+
{"version":3,"file":"fixtures.js","sourceRoot":"","sources":["../src/fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAInD,MAAM,cAAc,GAAoB,GAAG,EAAE,CAAC,IAAI,iBAAiB,EAAE,CAAC;AAEtE,MAAM,UAAU,sBAAsB,CAAC,UAA2B,cAAc;IAC9E,OAAO,KAAK,EACV,QAAiC,EACjC,GAAmD,EACnD,QAA2B,EAC3B,EAAE;QACF,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACzC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC;gBAAS,CAAC;YACT,MAAM,QAAQ,CAAC,KAAK,CAAC,aAAa,QAAQ,CAAC,KAAK,OAAO,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,IAAU,EACV,QAAgB,EAChB,IAAY,EACZ,KAAK,GAAG,EAAE;IAEV,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,kBAAkB;IACzB,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;IAC5D,IAAI,CAAC,aAAa,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;QAAE,OAAO,SAAS,CAAC;IACnE,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAmC;IAChE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE;QACrC,MAAM,SAAS,GAAG,kBAAkB,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,IAAI,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAClD,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC;gBAAS,CAAC;YACT,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAC5C,MAAM,UAAU,GAAG,OAAO;gBACxB,CAAC,CAAC,GAAG,OAAO,eAAe;gBAC3B,CAAC,CAAC,aAAa,QAAQ,CAAC,KAAK,OAAO,CAAC;YACvC,MAAM,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,OAAO,EAAE,MAAM,EAAE,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { defineConfig, loadConfig, demosProject, type ArgoConfig, type UserConfig, type TTSConfig, type TTSEngine, type VideoConfig, type ExportConfig, } from './config.js';
|
|
2
2
|
export { test, expect, demoType } from './fixtures.js';
|
|
3
|
-
export { NarrationTimeline } from './narration.js';
|
|
3
|
+
export { NarrationTimeline, type SceneDurationOptions } from './narration.js';
|
|
4
4
|
export { showCaption, hideCaption, withCaption } from './captions.js';
|
|
5
5
|
export { showOverlay, hideOverlay, withOverlay, type OverlayCue, type OverlayManifestEntry, type Zone, type TemplateType, type MotionPreset, } from './overlays/index.js';
|
|
6
6
|
export { type TTSEngineOptions } from './tts/engine.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,YAAY,GAClB,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,YAAY,GAClB,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGvD,OAAO,EAAE,iBAAiB,EAAE,KAAK,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAG9E,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGtE,OAAO,EACL,WAAW,EACX,WAAW,EACX,WAAW,EACX,KAAK,UAAU,EACf,KAAK,oBAAoB,EACzB,KAAK,IAAI,EACT,KAAK,YAAY,EACjB,KAAK,YAAY,GAClB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAErD,SAAS;AACT,OAAO,EACL,YAAY,EACZ,UAAU,EACV,YAAY,GAOb,MAAM,aAAa,CAAC;AAErB,WAAW;AACX,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEvD,YAAY;AACZ,OAAO,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAErD,SAAS;AACT,OAAO,EACL,YAAY,EACZ,UAAU,EACV,YAAY,GAOb,MAAM,aAAa,CAAC;AAErB,WAAW;AACX,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEvD,YAAY;AACZ,OAAO,EAAE,iBAAiB,EAA6B,MAAM,gBAAgB,CAAC;AAE9E,WAAW;AACX,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEtE,WAAW;AACX,OAAO,EACL,WAAW,EACX,WAAW,EACX,WAAW,GAMZ,MAAM,qBAAqB,CAAC;AAK7B,OAAO;AACP,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC"}
|
package/dist/narration.d.ts
CHANGED
|
@@ -1,9 +1,32 @@
|
|
|
1
|
+
export interface SceneDurationOptions {
|
|
2
|
+
leadInMs?: number;
|
|
3
|
+
leadOutMs?: number;
|
|
4
|
+
minMs?: number;
|
|
5
|
+
maxMs?: number;
|
|
6
|
+
multiplier?: number;
|
|
7
|
+
fallbackMs?: number;
|
|
8
|
+
}
|
|
1
9
|
export declare class NarrationTimeline {
|
|
2
10
|
private timings;
|
|
3
11
|
private startTime;
|
|
12
|
+
private sceneDurations;
|
|
13
|
+
private cachedPlacements;
|
|
14
|
+
constructor(sceneDurations?: Record<string, number>);
|
|
4
15
|
start(): void;
|
|
5
16
|
mark(scene: string): void;
|
|
6
17
|
getTimings(): Record<string, number>;
|
|
7
18
|
flush(outputPath: string): Promise<void>;
|
|
19
|
+
private getBaseDuration;
|
|
20
|
+
private getPlacements;
|
|
21
|
+
/**
|
|
22
|
+
* Compute a hold duration for a scene based on its TTS clip length.
|
|
23
|
+
* Use for overlay durations and passive reading time — not for
|
|
24
|
+
* page loads, click completion, or selector readiness.
|
|
25
|
+
*
|
|
26
|
+
* When the scene has already been marked, this returns the remaining wait
|
|
27
|
+
* from "now", not the full scene duration. It also accounts for any audio
|
|
28
|
+
* backlog caused by earlier clips running long.
|
|
29
|
+
*/
|
|
30
|
+
durationFor(scene: string, options?: SceneDurationOptions): number;
|
|
8
31
|
}
|
|
9
32
|
//# sourceMappingURL=narration.d.ts.map
|
package/dist/narration.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"narration.d.ts","sourceRoot":"","sources":["../src/narration.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"narration.d.ts","sourceRoot":"","sources":["../src/narration.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,gBAAgB,CAA4B;gBAExC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMnD,KAAK,IAAI,IAAI;IAMb,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAWzB,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAI9B,KAAK,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9C,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,aAAa;IAerB;;;;;;;;OAQG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,MAAM;CAmBnE"}
|
package/dist/narration.js
CHANGED
|
@@ -1,11 +1,20 @@
|
|
|
1
1
|
import { mkdir, writeFile } from 'node:fs/promises';
|
|
2
2
|
import { dirname } from 'node:path';
|
|
3
|
+
import { schedulePlacements } from './tts/align.js';
|
|
3
4
|
export class NarrationTimeline {
|
|
4
5
|
timings = new Map();
|
|
5
6
|
startTime = null;
|
|
7
|
+
sceneDurations = {};
|
|
8
|
+
cachedPlacements = null;
|
|
9
|
+
constructor(sceneDurations) {
|
|
10
|
+
if (sceneDurations) {
|
|
11
|
+
this.sceneDurations = sceneDurations;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
6
14
|
start() {
|
|
7
15
|
this.startTime = Date.now();
|
|
8
16
|
this.timings = new Map();
|
|
17
|
+
this.cachedPlacements = null;
|
|
9
18
|
}
|
|
10
19
|
mark(scene) {
|
|
11
20
|
if (this.startTime === null) {
|
|
@@ -15,6 +24,7 @@ export class NarrationTimeline {
|
|
|
15
24
|
throw new Error(`Duplicate scene name: "${scene}"`);
|
|
16
25
|
}
|
|
17
26
|
this.timings.set(scene, Date.now() - this.startTime);
|
|
27
|
+
this.cachedPlacements = null;
|
|
18
28
|
}
|
|
19
29
|
getTimings() {
|
|
20
30
|
return Object.fromEntries(this.timings);
|
|
@@ -23,5 +33,54 @@ export class NarrationTimeline {
|
|
|
23
33
|
await mkdir(dirname(outputPath), { recursive: true });
|
|
24
34
|
await writeFile(outputPath, JSON.stringify(this.getTimings(), null, 2), 'utf-8');
|
|
25
35
|
}
|
|
36
|
+
getBaseDuration(scene, options) {
|
|
37
|
+
const clipMs = this.sceneDurations[scene];
|
|
38
|
+
const fallback = options?.fallbackMs ?? 3000;
|
|
39
|
+
if (clipMs === undefined)
|
|
40
|
+
return fallback;
|
|
41
|
+
const raw = clipMs * (options?.multiplier ?? 1)
|
|
42
|
+
+ (options?.leadInMs ?? 200)
|
|
43
|
+
+ (options?.leadOutMs ?? 400);
|
|
44
|
+
const min = options?.minMs ?? 2200;
|
|
45
|
+
const max = options?.maxMs ?? 8000;
|
|
46
|
+
return Math.max(min, Math.min(max, raw));
|
|
47
|
+
}
|
|
48
|
+
getPlacements() {
|
|
49
|
+
if (this.cachedPlacements)
|
|
50
|
+
return this.cachedPlacements;
|
|
51
|
+
const scheduledScenes = Array.from(this.timings.entries())
|
|
52
|
+
.filter(([name]) => this.sceneDurations[name] !== undefined)
|
|
53
|
+
.map(([name, startMs]) => ({
|
|
54
|
+
scene: name,
|
|
55
|
+
startMs,
|
|
56
|
+
durationMs: this.sceneDurations[name],
|
|
57
|
+
}));
|
|
58
|
+
this.cachedPlacements = schedulePlacements(scheduledScenes);
|
|
59
|
+
return this.cachedPlacements;
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* Compute a hold duration for a scene based on its TTS clip length.
|
|
63
|
+
* Use for overlay durations and passive reading time — not for
|
|
64
|
+
* page loads, click completion, or selector readiness.
|
|
65
|
+
*
|
|
66
|
+
* When the scene has already been marked, this returns the remaining wait
|
|
67
|
+
* from "now", not the full scene duration. It also accounts for any audio
|
|
68
|
+
* backlog caused by earlier clips running long.
|
|
69
|
+
*/
|
|
70
|
+
durationFor(scene, options) {
|
|
71
|
+
const baseDurationMs = this.getBaseDuration(scene, options);
|
|
72
|
+
if (this.startTime === null)
|
|
73
|
+
return baseDurationMs;
|
|
74
|
+
const markMs = this.timings.get(scene);
|
|
75
|
+
if (markMs === undefined)
|
|
76
|
+
return baseDurationMs;
|
|
77
|
+
const placement = this.getPlacements().find((p) => p.scene === scene);
|
|
78
|
+
if (!placement)
|
|
79
|
+
return baseDurationMs;
|
|
80
|
+
const leadOutMs = options?.leadOutMs ?? 400;
|
|
81
|
+
const desiredEndMs = Math.max(markMs + baseDurationMs, placement.endMs + leadOutMs);
|
|
82
|
+
const nowMs = Math.max(0, Date.now() - this.startTime);
|
|
83
|
+
return Math.max(0, Math.ceil(desiredEndMs - nowMs));
|
|
84
|
+
}
|
|
26
85
|
}
|
|
27
86
|
//# sourceMappingURL=narration.js.map
|
package/dist/narration.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"narration.js","sourceRoot":"","sources":["../src/narration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"narration.js","sourceRoot":"","sources":["../src/narration.ts"],"names":[],"mappings":"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"}
|
package/dist/overlays/index.d.ts
CHANGED
|
@@ -2,7 +2,12 @@ import type { Page } from '@playwright/test';
|
|
|
2
2
|
import type { OverlayCue, Zone } from './types.js';
|
|
3
3
|
export type { OverlayCue, OverlayManifestEntry, Zone, TemplateType, MotionPreset } from './types.js';
|
|
4
4
|
export { renderTemplate } from './templates.js';
|
|
5
|
-
export
|
|
5
|
+
export type { BackgroundTheme } from './zones.js';
|
|
6
|
+
export declare function showOverlay(page: Page, _scene: string, cue: OverlayCue, durationMs: number, options?: {
|
|
7
|
+
autoBackground?: boolean;
|
|
8
|
+
}): Promise<void>;
|
|
6
9
|
export declare function hideOverlay(page: Page, zone?: Zone): Promise<void>;
|
|
7
|
-
export declare function withOverlay(page: Page, _scene: string, cue: OverlayCue, action: () => Promise<void
|
|
10
|
+
export declare function withOverlay(page: Page, _scene: string, cue: OverlayCue, action: () => Promise<void>, options?: {
|
|
11
|
+
autoBackground?: boolean;
|
|
12
|
+
}): Promise<void>;
|
|
8
13
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/overlays/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/overlays/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAMnD,YAAY,EAAE,UAAU,EAAE,oBAAoB,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACrG,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAiBlD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,UAAU,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACrC,OAAO,CAAC,IAAI,CAAC,CAYf;AAED,wBAAsB,WAAW,CAC/B,IAAI,EAAE,IAAI,EACV,IAAI,GAAE,IAAsB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAsB,WAAW,CAC/B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,UAAU,EACf,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAC3B,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACrC,OAAO,CAAC,IAAI,CAAC,CAef"}
|
package/dist/overlays/index.js
CHANGED
|
@@ -1,11 +1,21 @@
|
|
|
1
|
-
import { injectIntoZone, removeZone, ZONE_ID_PREFIX } from './zones.js';
|
|
1
|
+
import { injectIntoZone, removeZone, ZONE_ID_PREFIX, detectBackgroundTheme } from './zones.js';
|
|
2
2
|
import { renderTemplate } from './templates.js';
|
|
3
3
|
import { getMotionCSS, getMotionStyles } from './motion.js';
|
|
4
4
|
export { renderTemplate } from './templates.js';
|
|
5
|
-
|
|
5
|
+
function getConfigAutoBackground() {
|
|
6
|
+
return process.env.ARGO_AUTO_BACKGROUND === '1';
|
|
7
|
+
}
|
|
8
|
+
async function resolveTheme(page, cue, zone, optionsAutoBackground) {
|
|
9
|
+
const shouldDetect = cue.autoBackground ?? optionsAutoBackground ?? getConfigAutoBackground();
|
|
10
|
+
if (!shouldDetect)
|
|
11
|
+
return 'dark';
|
|
12
|
+
return detectBackgroundTheme(page, zone);
|
|
13
|
+
}
|
|
14
|
+
export async function showOverlay(page, _scene, cue, durationMs, options) {
|
|
6
15
|
const zone = cue.placement ?? 'bottom-center';
|
|
7
16
|
const motion = cue.motion ?? 'none';
|
|
8
|
-
const
|
|
17
|
+
const theme = await resolveTheme(page, cue, zone, options?.autoBackground);
|
|
18
|
+
const { contentHtml, styles } = renderTemplate(cue, theme);
|
|
9
19
|
const zoneId = ZONE_ID_PREFIX + zone;
|
|
10
20
|
const motionCSS = getMotionCSS(motion, zoneId);
|
|
11
21
|
const motionStyles = getMotionStyles(motion, zoneId);
|
|
@@ -16,10 +26,11 @@ export async function showOverlay(page, _scene, cue, durationMs) {
|
|
|
16
26
|
export async function hideOverlay(page, zone = 'bottom-center') {
|
|
17
27
|
await removeZone(page, zone);
|
|
18
28
|
}
|
|
19
|
-
export async function withOverlay(page, _scene, cue, action) {
|
|
29
|
+
export async function withOverlay(page, _scene, cue, action, options) {
|
|
20
30
|
const zone = cue.placement ?? 'bottom-center';
|
|
21
31
|
const motion = cue.motion ?? 'none';
|
|
22
|
-
const
|
|
32
|
+
const theme = await resolveTheme(page, cue, zone, options?.autoBackground);
|
|
33
|
+
const { contentHtml, styles } = renderTemplate(cue, theme);
|
|
23
34
|
const zoneId = ZONE_ID_PREFIX + zone;
|
|
24
35
|
const motionCSS = getMotionCSS(motion, zoneId);
|
|
25
36
|
const motionStyles = getMotionStyles(motion, zoneId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/overlays/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/overlays/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAE/F,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG5D,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,SAAS,uBAAuB;IAC9B,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,GAAG,CAAC;AAClD,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,IAAU,EACV,GAAe,EACf,IAAU,EACV,qBAA+B;IAE/B,MAAM,YAAY,GAAG,GAAG,CAAC,cAAc,IAAI,qBAAqB,IAAI,uBAAuB,EAAE,CAAC;IAC9F,IAAI,CAAC,YAAY;QAAE,OAAO,MAAM,CAAC;IACjC,OAAO,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,IAAU,EACV,MAAc,EACd,GAAe,EACf,UAAkB,EAClB,OAAsC;IAEtC,MAAM,IAAI,GAAS,GAAG,CAAC,SAAS,IAAI,eAAe,CAAC;IACpD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC;IACpC,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC3E,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,cAAc,GAAG,IAAI,CAAC;IACrC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAErD,MAAM,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,GAAG,MAAM,EAAE,GAAG,YAAY,EAAE,EAAE,SAAS,CAAC,CAAC;IACzF,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IACtC,MAAM,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,IAAU,EACV,OAAa,eAAe;IAE5B,MAAM,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,IAAU,EACV,MAAc,EACd,GAAe,EACf,MAA2B,EAC3B,OAAsC;IAEtC,MAAM,IAAI,GAAS,GAAG,CAAC,SAAS,IAAI,eAAe,CAAC;IACpD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC;IACpC,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC3E,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,cAAc,GAAG,IAAI,CAAC;IACrC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAErD,MAAM,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,GAAG,MAAM,EAAE,GAAG,YAAY,EAAE,EAAE,SAAS,CAAC,CAAC;IACzF,IAAI,CAAC;QACH,MAAM,MAAM,EAAE,CAAC;IACjB,CAAC;YAAS,CAAC;QACT,MAAM,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { OverlayCue } from './types.js';
|
|
2
|
+
import type { BackgroundTheme } from './zones.js';
|
|
2
3
|
export interface TemplateResult {
|
|
3
4
|
contentHtml: string;
|
|
4
5
|
styles: Record<string, string>;
|
|
5
6
|
}
|
|
6
|
-
export declare function renderTemplate(cue: OverlayCue): TemplateResult;
|
|
7
|
+
export declare function renderTemplate(cue: OverlayCue, theme?: BackgroundTheme): TemplateResult;
|
|
7
8
|
//# sourceMappingURL=templates.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/overlays/templates.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/overlays/templates.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AA4GD,wBAAgB,cAAc,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,GAAE,eAAwB,GAAG,cAAc,CAW/F"}
|
|
@@ -5,12 +5,13 @@ function escapeHtml(str) {
|
|
|
5
5
|
.replace(/>/g, '>')
|
|
6
6
|
.replace(/"/g, '"');
|
|
7
7
|
}
|
|
8
|
-
function lowerThird(text) {
|
|
8
|
+
function lowerThird(text, theme) {
|
|
9
|
+
const isDark = theme === 'dark';
|
|
9
10
|
return {
|
|
10
11
|
contentHtml: `<span>${escapeHtml(text)}</span>`,
|
|
11
12
|
styles: {
|
|
12
|
-
background: 'rgba(0, 0, 0, 0.85)',
|
|
13
|
-
color: '#fff',
|
|
13
|
+
background: isDark ? 'rgba(0, 0, 0, 0.85)' : 'rgba(255, 255, 255, 0.9)',
|
|
14
|
+
color: isDark ? '#fff' : '#1a1a1a',
|
|
14
15
|
padding: '16px 32px',
|
|
15
16
|
borderRadius: '12px',
|
|
16
17
|
fontSize: '28px',
|
|
@@ -19,80 +20,83 @@ function lowerThird(text) {
|
|
|
19
20
|
maxWidth: '80vw',
|
|
20
21
|
letterSpacing: '0.01em',
|
|
21
22
|
lineHeight: '1.4',
|
|
22
|
-
boxShadow: '0 4px 24px rgba(0, 0, 0, 0.3)',
|
|
23
|
+
boxShadow: isDark ? '0 4px 24px rgba(0, 0, 0, 0.3)' : '0 4px 24px rgba(0, 0, 0, 0.12)',
|
|
23
24
|
},
|
|
24
25
|
};
|
|
25
26
|
}
|
|
26
|
-
function headlineCard(title, kicker, body) {
|
|
27
|
+
function headlineCard(title, theme, kicker, body) {
|
|
28
|
+
const isDark = theme === 'dark';
|
|
27
29
|
const parts = [];
|
|
28
30
|
if (kicker) {
|
|
29
|
-
parts.push(`<div style="font-size:12px;font-weight:700;letter-spacing:0.08em;text-transform:uppercase;color
|
|
31
|
+
parts.push(`<div style="font-size:12px;font-weight:700;letter-spacing:0.08em;text-transform:uppercase;color:${isDark ? 'rgba(255,255,255,0.7)' : 'rgba(0,0,0,0.5)'};margin-bottom:8px">${escapeHtml(kicker)}</div>`);
|
|
30
32
|
}
|
|
31
|
-
parts.push(`<div style="font-size:26px;font-weight:700;line-height:1.25;color
|
|
33
|
+
parts.push(`<div style="font-size:26px;font-weight:700;line-height:1.25;color:${isDark ? '#fff' : '#1a1a1a'}">${escapeHtml(title)}</div>`);
|
|
32
34
|
if (body) {
|
|
33
|
-
parts.push(`<div style="font-size:16px;line-height:1.5;color
|
|
35
|
+
parts.push(`<div style="font-size:16px;line-height:1.5;color:${isDark ? 'rgba(255,255,255,0.85)' : 'rgba(0,0,0,0.7)'};margin-top:8px">${escapeHtml(body)}</div>`);
|
|
34
36
|
}
|
|
35
37
|
return {
|
|
36
38
|
contentHtml: parts.join(''),
|
|
37
39
|
styles: {
|
|
38
|
-
background: 'rgba(0, 0, 0, 0.7)',
|
|
40
|
+
background: isDark ? 'rgba(0, 0, 0, 0.7)' : 'rgba(255, 255, 255, 0.85)',
|
|
39
41
|
backdropFilter: 'blur(16px)',
|
|
40
42
|
WebkitBackdropFilter: 'blur(16px)',
|
|
41
43
|
padding: '24px 28px',
|
|
42
44
|
borderRadius: '16px',
|
|
43
45
|
maxWidth: '420px',
|
|
44
|
-
boxShadow: '0 8px 32px rgba(0, 0, 0, 0.4)',
|
|
46
|
+
boxShadow: isDark ? '0 8px 32px rgba(0, 0, 0, 0.4)' : '0 8px 32px rgba(0, 0, 0, 0.1)',
|
|
45
47
|
},
|
|
46
48
|
};
|
|
47
49
|
}
|
|
48
|
-
function callout(text) {
|
|
50
|
+
function callout(text, theme) {
|
|
51
|
+
const isDark = theme === 'dark';
|
|
49
52
|
return {
|
|
50
53
|
contentHtml: `<span>${escapeHtml(text)}</span>`,
|
|
51
54
|
styles: {
|
|
52
|
-
background: 'rgba(0, 0, 0, 0.8)',
|
|
53
|
-
color: '#fff',
|
|
55
|
+
background: isDark ? 'rgba(0, 0, 0, 0.8)' : 'rgba(255, 255, 255, 0.9)',
|
|
56
|
+
color: isDark ? '#fff' : '#1a1a1a',
|
|
54
57
|
padding: '10px 18px',
|
|
55
58
|
borderRadius: '20px',
|
|
56
59
|
fontSize: '16px',
|
|
57
60
|
fontWeight: '500',
|
|
58
61
|
lineHeight: '1.3',
|
|
59
62
|
maxWidth: '300px',
|
|
60
|
-
boxShadow: '0 2px 12px rgba(0, 0, 0, 0.3)',
|
|
63
|
+
boxShadow: isDark ? '0 2px 12px rgba(0, 0, 0, 0.3)' : '0 2px 12px rgba(0, 0, 0, 0.1)',
|
|
61
64
|
},
|
|
62
65
|
};
|
|
63
66
|
}
|
|
64
|
-
function imageCard(src, title, body) {
|
|
67
|
+
function imageCard(src, theme, title, body) {
|
|
68
|
+
const isDark = theme === 'dark';
|
|
65
69
|
const parts = [];
|
|
66
70
|
parts.push(`<img src="${escapeHtml(src)}" style="max-width:100%;border-radius:8px;display:block" />`);
|
|
67
71
|
if (title) {
|
|
68
|
-
parts.push(`<div style="font-size:18px;font-weight:600;color
|
|
72
|
+
parts.push(`<div style="font-size:18px;font-weight:600;color:${isDark ? '#fff' : '#1a1a1a'};margin-top:12px">${escapeHtml(title)}</div>`);
|
|
69
73
|
}
|
|
70
74
|
if (body) {
|
|
71
|
-
parts.push(`<div style="font-size:14px;color
|
|
75
|
+
parts.push(`<div style="font-size:14px;color:${isDark ? 'rgba(255,255,255,0.8)' : 'rgba(0,0,0,0.7)'};margin-top:4px;line-height:1.4">${escapeHtml(body)}</div>`);
|
|
72
76
|
}
|
|
73
77
|
return {
|
|
74
78
|
contentHtml: parts.join(''),
|
|
75
79
|
styles: {
|
|
76
|
-
background: 'rgba(0, 0, 0, 0.75)',
|
|
80
|
+
background: isDark ? 'rgba(0, 0, 0, 0.75)' : 'rgba(255, 255, 255, 0.85)',
|
|
77
81
|
backdropFilter: 'blur(12px)',
|
|
78
82
|
WebkitBackdropFilter: 'blur(12px)',
|
|
79
83
|
padding: '16px',
|
|
80
84
|
borderRadius: '14px',
|
|
81
85
|
maxWidth: '360px',
|
|
82
|
-
boxShadow: '0 6px 24px rgba(0, 0, 0, 0.4)',
|
|
86
|
+
boxShadow: isDark ? '0 6px 24px rgba(0, 0, 0, 0.4)' : '0 6px 24px rgba(0, 0, 0, 0.1)',
|
|
83
87
|
},
|
|
84
88
|
};
|
|
85
89
|
}
|
|
86
|
-
export function renderTemplate(cue) {
|
|
90
|
+
export function renderTemplate(cue, theme = 'dark') {
|
|
87
91
|
switch (cue.type) {
|
|
88
92
|
case 'lower-third':
|
|
89
|
-
return lowerThird(cue.text);
|
|
93
|
+
return lowerThird(cue.text, theme);
|
|
90
94
|
case 'headline-card':
|
|
91
|
-
return headlineCard(cue.title, cue.kicker, cue.body);
|
|
95
|
+
return headlineCard(cue.title, theme, cue.kicker, cue.body);
|
|
92
96
|
case 'callout':
|
|
93
|
-
return callout(cue.text);
|
|
97
|
+
return callout(cue.text, theme);
|
|
94
98
|
case 'image-card':
|
|
95
|
-
return imageCard(cue.src, cue.title, cue.body);
|
|
99
|
+
return imageCard(cue.src, theme, cue.title, cue.body);
|
|
96
100
|
}
|
|
97
101
|
}
|
|
98
102
|
//# sourceMappingURL=templates.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templates.js","sourceRoot":"","sources":["../../src/overlays/templates.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"templates.js","sourceRoot":"","sources":["../../src/overlays/templates.ts"],"names":[],"mappings":"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"}
|