@bendyline/squisq-cli 2.3.0 → 2.3.2

package/dist/{api-5SX73ZKT.js → api-A7FKMZY6.js}

@@ -11,7 +11,7 @@ import {
   readInput,
   renderDocToGif,
   renderDocToMp4
-} from "./chunk-GYHQHKO5.js";
+} from "./chunk-ZEN42AFN.js";
 import {
   GIF_EXPORT_DEFAULTS,
   framesToGifNative,

package/dist/api.d.ts

@@ -23,7 +23,7 @@ interface Mp4FormatOptions {
     orientation?: VideoOrientation;
     width?: number;
     height?: number;
-    captionStyle?: 'standard' | 'social';
+    captionStyle?: 'off' | 'standard' | 'social';
     coverPreRoll?: number;
     animationsEnabled?: boolean;
 }
@@ -34,7 +34,7 @@ interface GifFormatOptions {
     orientation?: VideoOrientation;
     width?: number;
     height?: number;
-    captionStyle?: 'standard' | 'social';
+    captionStyle?: 'off' | 'standard' | 'social';
     coverPreRoll?: number;
     animationsEnabled?: boolean;
     loop?: number;
@@ -258,8 +258,8 @@ interface RenderDocToMp4Options {
     width?: number;
     /** Override video height in pixels. */
     height?: number;
-    /** Caption style to bake into the video (default: none). */
-    captionStyle?: 'standard' | 'social';
+    /** Caption mode to bake into the video (default: off). */
+    captionStyle?: 'off' | 'standard' | 'social';
     /** Render layer animations and block transitions (default: true). */
     animationsEnabled?: boolean;
     /**
@@ -289,8 +289,8 @@ interface RenderDocToGifOptions {
     width?: number;
     /** Override output height (default: 540 landscape / 960 portrait). */
     height?: number;
-    /** Caption style to bake into the GIF (default: none). */
-    captionStyle?: 'standard' | 'social';
+    /** Caption mode to bake into the GIF (default: standard). */
+    captionStyle?: 'off' | 'standard' | 'social';
     /** Seconds of cover-slide pre-roll (default: 0). */
     coverPreRoll?: number;
     /** Render layer animations and block transitions (default: false). */

package/dist/api.js

@@ -8,6 +8,7 @@ import {
 } from "./chunk-Z3BHD4AF.js";
 
 // src/api.ts
+import { readFile as readFile3 } from "fs/promises";
 import { resolveMediaSchedule } from "@bendyline/squisq/schemas";
 import { flattenBlocks } from "@bendyline/squisq/doc";
 import { ffmpegGifOutputArgs, generateRenderHtml } from "@bendyline/squisq-video";
@@ -96,7 +97,7 @@ async function buildMixedAudioTrack(doc, container, ffmpegPath, coverPreRoll, si
   return mixTimelineClips(ffmpegPath, usable, signal);
 }
 async function mixTimelineClips(ffmpegPath, usable, signal) {
-  const { writeFile, readFile: readFile3, mkdir, rm: rm2 } = await import("fs/promises");
+  const { writeFile, readFile: readFile4, mkdir, rm: rm2 } = await import("fs/promises");
   const { join: join3 } = await import("path");
   const { tmpdir: tmpdir2 } = await import("os");
   const { randomBytes: randomBytes2 } = await import("crypto");
@@ -144,7 +145,7 @@ async function mixTimelineClips(ffmpegPath, usable, signal) {
       signal
     });
     signal?.throwIfAborted();
-    const data = await readFile3(outputPath);
+    const data = await readFile4(outputPath);
     signal?.throwIfAborted();
     return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
   } finally {
@@ -663,17 +664,25 @@ function throwIfAborted(signal) {
 
 // src/api.ts
 import { ConversionError } from "@bendyline/squisq-formats";
+var playerBundlePromise;
+function loadPlayerBundle() {
+  playerBundlePromise ??= readFile3(
+    new URL("../dist/squisq-player.global.js", import.meta.url),
+    "utf8"
+  );
+  return playerBundlePromise;
+}
 async function convert(source, to, options = {}) {
   return formatsConvert(source, to, {
     registry: createCliRegistry(),
-    resolvePlayerScript: () => import("@bendyline/squisq-react/standalone-source").then((m) => m.PLAYER_BUNDLE),
+    resolvePlayerScript: loadPlayerBundle,
     ...options
   });
 }
 async function prepareConversion(source, options = {}) {
   return formatsPrepareConversion(source, {
     registry: createCliRegistry(),
-    resolvePlayerScript: () => import("@bendyline/squisq-react/standalone-source").then((m) => m.PLAYER_BUNDLE),
+    resolvePlayerScript: loadPlayerBundle,
     ...options
   });
 }
@@ -732,10 +741,10 @@ async function captureDocFrames(doc, container, options) {
   }
   onProgress?.("generating render HTML", 10);
   signal?.throwIfAborted();
-  const { PLAYER_BUNDLE } = await import("@bendyline/squisq-react/standalone-source");
+  const playerBundle = await loadPlayerBundle();
   signal?.throwIfAborted();
   const renderHtml = generateRenderHtml(doc, {
-    playerScript: PLAYER_BUNDLE,
+    playerScript: playerBundle,
     images,
     audio: audio.size > 0 ? audio : void 0,
     width,
@@ -876,7 +885,7 @@ async function renderDocToMp4(doc, container, options) {
     fps,
     width: dimensions.width,
     height: dimensions.height,
-    captionStyle: options.captionStyle,
+    captionStyle: options.captionStyle === "off" ? void 0 : options.captionStyle,
     coverPreRoll: options.coverPreRoll ?? 0,
     animationsEnabled: options.animationsEnabled ?? true,
     onProgress: options.onProgress,
@@ -939,7 +948,7 @@ async function renderDocToGif(doc, container, options) {
     fps,
     width,
     height,
-    captionStyle: options.captionStyle,
+    captionStyle: options.captionStyle === "off" ? void 0 : options.captionStyle ?? "standard",
     coverPreRoll: options.coverPreRoll ?? 0,
     animationsEnabled: options.animationsEnabled ?? false,
     onProgress: options.onProgress,

package/dist/{chunk-GYHQHKO5.js → chunk-ZEN42AFN.js}

@@ -5,6 +5,7 @@ import {
 } from "./chunk-GGVASRPG.js";
 
 // src/api.ts
+import { readFile as readFile3 } from "fs/promises";
 import { resolveMediaSchedule } from "@bendyline/squisq/schemas";
 import { flattenBlocks } from "@bendyline/squisq/doc";
 import { ffmpegGifOutputArgs, generateRenderHtml } from "@bendyline/squisq-video";
@@ -93,7 +94,7 @@ async function buildMixedAudioTrack(doc, container, ffmpegPath, coverPreRoll, si
   return mixTimelineClips(ffmpegPath, usable, signal);
 }
 async function mixTimelineClips(ffmpegPath, usable, signal) {
-  const { writeFile, readFile: readFile3, mkdir, rm: rm2 } = await import("fs/promises");
+  const { writeFile, readFile: readFile4, mkdir, rm: rm2 } = await import("fs/promises");
   const { join: join3 } = await import("path");
   const { tmpdir: tmpdir2 } = await import("os");
   const { randomBytes: randomBytes2 } = await import("crypto");
@@ -141,7 +142,7 @@ async function mixTimelineClips(ffmpegPath, usable, signal) {
       signal
     });
     signal?.throwIfAborted();
-    const data = await readFile3(outputPath);
+    const data = await readFile4(outputPath);
     signal?.throwIfAborted();
     return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
   } finally {
@@ -307,7 +308,7 @@ function mp4Format() {
       const animationsEnabled = typeof mp4Opts.animationsEnabled === "boolean" ? mp4Opts.animationsEnabled : MP4_DEFAULTS.animationsEnabled;
       const outputPath = join(tmpdir(), `squisq-mp4-${randomBytes(8).toString("hex")}.mp4`);
       try {
-        const { renderDocToMp4: renderDocToMp42 } = await import("./api-5SX73ZKT.js");
+        const { renderDocToMp4: renderDocToMp42 } = await import("./api-A7FKMZY6.js");
         await renderDocToMp42(input.doc, input.container, {
           outputPath,
           fps,
@@ -347,7 +348,7 @@ function gifFormat() {
       const defaultHeight = portrait ? GIF_DEFAULTS.width : GIF_DEFAULTS.height;
       const outputPath = join(tmpdir(), `squisq-gif-${randomBytes(8).toString("hex")}.gif`);
       try {
-        const { renderDocToGif: renderDocToGif2 } = await import("./api-5SX73ZKT.js");
+        const { renderDocToGif: renderDocToGif2 } = await import("./api-A7FKMZY6.js");
         const result = await renderDocToGif2(input.doc, input.container, {
           outputPath,
           fps: typeof gifOpts.fps === "number" ? gifOpts.fps : GIF_DEFAULTS.fps,
@@ -660,17 +661,25 @@ function throwIfAborted(signal) {
 
 // src/api.ts
 import { ConversionError } from "@bendyline/squisq-formats";
+var playerBundlePromise;
+function loadPlayerBundle() {
+  playerBundlePromise ??= readFile3(
+    new URL("../dist/squisq-player.global.js", import.meta.url),
+    "utf8"
+  );
+  return playerBundlePromise;
+}
 async function convert(source, to, options = {}) {
   return formatsConvert(source, to, {
     registry: createCliRegistry(),
-    resolvePlayerScript: () => import("@bendyline/squisq-react/standalone-source").then((m) => m.PLAYER_BUNDLE),
+    resolvePlayerScript: loadPlayerBundle,
     ...options
   });
 }
 async function prepareConversion(source, options = {}) {
   return formatsPrepareConversion(source, {
     registry: createCliRegistry(),
-    resolvePlayerScript: () => import("@bendyline/squisq-react/standalone-source").then((m) => m.PLAYER_BUNDLE),
+    resolvePlayerScript: loadPlayerBundle,
     ...options
   });
 }
@@ -729,10 +738,10 @@ async function captureDocFrames(doc, container, options) {
   }
   onProgress?.("generating render HTML", 10);
   signal?.throwIfAborted();
-  const { PLAYER_BUNDLE } = await import("@bendyline/squisq-react/standalone-source");
+  const playerBundle = await loadPlayerBundle();
   signal?.throwIfAborted();
   const renderHtml = generateRenderHtml(doc, {
-    playerScript: PLAYER_BUNDLE,
+    playerScript: playerBundle,
     images,
     audio: audio.size > 0 ? audio : void 0,
     width,
@@ -873,7 +882,7 @@ async function renderDocToMp4(doc, container, options) {
     fps,
     width: dimensions.width,
     height: dimensions.height,
-    captionStyle: options.captionStyle,
+    captionStyle: options.captionStyle === "off" ? void 0 : options.captionStyle,
     coverPreRoll: options.coverPreRoll ?? 0,
     animationsEnabled: options.animationsEnabled ?? true,
     onProgress: options.onProgress,
@@ -936,7 +945,7 @@ async function renderDocToGif(doc, container, options) {
     fps,
     width,
     height,
-    captionStyle: options.captionStyle,
+    captionStyle: options.captionStyle === "off" ? void 0 : options.captionStyle ?? "standard",
     coverPreRoll: options.coverPreRoll ?? 0,
     animationsEnabled: options.animationsEnabled ?? false,
     onProgress: options.onProgress,

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   readInput,
   renderDocToGif,
   renderDocToMp4
-} from "./chunk-GYHQHKO5.js";
+} from "./chunk-ZEN42AFN.js";
 import "./chunk-GGVASRPG.js";
 
 // src/index.ts
@@ -17,6 +17,7 @@ import { Command } from "commander";
 // src/commands/convert.ts
 import { mkdir } from "fs/promises";
 import { dirname, basename, extname, join, resolve } from "path";
+import { Option } from "commander";
 import { BUILTIN_FORMAT_IDS, ConversionError } from "@bendyline/squisq-formats";
 
 // src/util/applyTransformPipeline.ts
@@ -163,6 +164,12 @@ function parseFormats(value) {
       `Unknown format${unknown.length > 1 ? "s" : ""}: ${hints}. Valid: ${VALID_FORMATS.join(", ")}`
     );
   }
+  const duplicates = [...new Set(requested.filter((id, index) => requested.indexOf(id) !== index))];
+  if (duplicates.length > 0) {
+    throw new Error(
+      `Duplicate format${duplicates.length > 1 ? "s" : ""}: ${duplicates.map((id) => `"${id}"`).join(", ")}. Each format may only be requested once.`
+    );
+  }
   return requested;
 }
 function formatFromOutputPath(outputPath) {
@@ -180,12 +187,21 @@ function formatFromOutputPath(outputPath) {
 function registerConvertCommand(program2) {
   program2.command("convert").description(
     "Convert a document to DOCX, PPTX, PDF, HTML, EPUB, MP4, animated GIF, and container formats"
-  ).argument("<input>", "Path to .md/.docx/.pptx/.pdf/.xlsx/.csv/.html file, .zip/.dbk, or folder").option("-o, --output <file>", "Single output file (format inferred from its extension)").option(
-    "-d, --output-dir <dir>",
-    "Output directory for multi-format export (default: same as input)"
-  ).option(
-    "-f, --formats <list>",
-    `Comma-separated formats to produce (default: a standard set). Valid: ${VALID_FORMATS.join(", ")}`
+  ).argument("<input>", "Path to .md/.docx/.pptx/.pdf/.xlsx/.csv/.html file, .zip/.dbk, or folder").addOption(
+    new Option(
+      "-o, --output <file>",
+      "Single output file (format inferred from its extension)"
+    ).conflicts(["outputDir", "formats"])
+  ).addOption(
+    new Option(
+      "-d, --output-dir <dir>",
+      "Output directory for multi-format export (default: same as input)"
+    ).conflicts("output")
+  ).addOption(
+    new Option(
+      "-f, --formats <list>",
+      `Comma-separated formats to produce (default: a standard set). Valid: ${VALID_FORMATS.join(", ")}`
+    ).conflicts("output")
   ).option("--overwrite", "Replace existing output files (default: refuse and exit non-zero)").option("-t, --theme <id>", "Squisq theme ID to apply (e.g., documentary, cinematic, bold)").option(
     "--transform <style>",
     "Transform style to apply before export (e.g., documentary, magazine, minimal)"
@@ -305,8 +321,7 @@ function registerVideoCommand(program2) {
     "landscape"
   ).option(
     "--captions <style>",
-    `Caption style: ${VALID_CAPTIONS.join(", ")} (default: off)`,
-    "off"
+    `Caption style: ${VALID_CAPTIONS.join(", ")} (default: off for MP4, standard for GIF)`
   ).option(
     "--no-auto-templates",
     "Disable content-aware template auto-picking for unannotated headings"
@@ -322,9 +337,10 @@ function registerVideoCommand(program2) {
     `GIF dithering: ${VALID_GIF_DITHERS.join(", ")} (default: sierra2_4a)`
   ).option("--bayer-scale <number>", "GIF Bayer dither strength from 0 to 5 (default: 3)").action(async (inputPath, outputArg, opts) => {
     try {
-      if (outputArg && !opts.output) {
-        opts.output = outputArg;
+      if (outputArg && opts.output) {
+        throw new Error("The positional output and --output cannot be used together.");
       }
+      if (outputArg) opts.output = outputArg;
       await runVideo(inputPath, opts);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
@@ -351,9 +367,9 @@ async function runVideo(inputPath, opts) {
   }
   const outputFormat = requestedFormat ?? extensionFormat ?? "mp4";
   const maxFps = outputFormat === "gif" ? 100 : 120;
-  const fps = parseInt(opts.fps ?? (outputFormat === "gif" ? "10" : "30"), 10);
-  if (isNaN(fps) || fps < 1 || fps > maxFps) {
-    throw new Error(`FPS must be a number between 1 and ${maxFps}`);
+  const fps = Number(opts.fps ?? (outputFormat === "gif" ? "10" : "30"));
+  if (!Number.isSafeInteger(fps) || fps < 1 || fps > maxFps) {
+    throw new Error(`FPS must be an integer between 1 and ${maxFps}`);
   }
   const quality = opts.quality ?? "normal";
   if (outputFormat === "gif" && opts.quality !== void 0) {
@@ -368,16 +384,15 @@ async function runVideo(inputPath, opts) {
       `Invalid orientation "${orientation}". Valid: ${VALID_ORIENTATIONS.join(", ")}`
     );
   }
-  const width = opts.width === void 0 ? void 0 : parseInt(opts.width, 10);
-  const height = opts.height === void 0 ? void 0 : parseInt(opts.height, 10);
+  const width = opts.width === void 0 ? void 0 : Number(opts.width);
+  const height = opts.height === void 0 ? void 0 : Number(opts.height);
   validateVideoExportOptions({ width, height, orientation });
-  const captions = opts.captions ?? "off";
+  const captions = opts.captions ?? (outputFormat === "gif" ? "standard" : "off");
   if (!VALID_CAPTIONS.includes(captions)) {
     throw new Error(`Invalid captions "${captions}". Valid: ${VALID_CAPTIONS.join(", ")}`);
   }
-  const captionStyle = captions === "off" ? void 0 : captions;
-  const coverPreRoll = parseFloat(opts.coverPreroll ?? "2");
-  if (isNaN(coverPreRoll) || coverPreRoll < 0) {
+  const coverPreRoll = Number(opts.coverPreroll ?? "2");
+  if (!Number.isFinite(coverPreRoll) || coverPreRoll < 0) {
     throw new Error("Cover pre-roll must be a number of seconds >= 0");
   }
   const animationsEnabled = opts.animations ?? outputFormat === "mp4";
@@ -445,7 +460,7 @@ async function runVideo(inputPath, opts) {
     orientation,
     width,
     height,
-    captionStyle,
+    captionStyle: captions,
     coverPreRoll,
     animationsEnabled,
     onProgress: (phase, percent) => writeProgress(phase, percent, 100)