@bendyline/docblocks-cli 1.1.1 → 2.0.0

package/dist/commands/serve.d.ts

@@ -1,3 +1,36 @@
 import { Command } from 'commander';
+import { type Server } from 'node:http';
+export interface ServeOptions {
+    port: number;
+    dir: string;
+    theme?: string;
+    host?: string;
+    allowNetwork?: boolean;
+    maxFileBytes?: number;
+    maxConcurrentReads?: number;
+}
+export interface PreviewServer {
+    server: Server;
+    root: string;
+    host: string;
+    url: string;
+}
+export declare function startPreviewServer(opts: ServeOptions): Promise<PreviewServer>;
 export declare const serveCommand: Command;
+type ServeTarget = {
+    kind: 'file';
+    filePath: string;
+    markdown: boolean;
+} | {
+    kind: 'missing';
+} | {
+    kind: 'forbidden';
+} | {
+    kind: 'too-large';
+} | {
+    kind: 'bad-request';
+};
+export declare function resolveServeTarget(root: string, requestUrl: string, maxFileBytes?: number): Promise<ServeTarget>;
+export declare function isAllowedPreviewRequestAuthority(header: string | undefined, configuredHost: string, configuredPort: number): boolean;
+export {};
 //# sourceMappingURL=serve.d.ts.map

package/dist/commands/serve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,eAAO,MAAM,YAAY,SASrB,CAAC"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAsC,KAAK,MAAM,EAAuB,MAAM,WAAW,CAAC;AAQjG,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAKD,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,CA8CnF;AAED,eAAO,MAAM,YAAY,SA8BtB,CAAC;AAuDJ,KAAK,WAAW,GACZ;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC;AAE5B,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,YAAY,SAAyB,GACpC,OAAO,CAAC,WAAW,CAAC,CAkCtB;AAqHD,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,GACrB,OAAO,CAOT"}

package/dist/commands/serve.js

@@ -1,10 +1,347 @@
 import { Command } from 'commander';
+import { createServer } from 'node:http';
+import { realpath, stat } from 'node:fs/promises';
+import { isIP } from 'node:net';
+import path from 'node:path';
+import { renderMarkdownHtml } from '../render-html.js';
+import { readContainedFile } from '../contained-file.js';
+import { isAllowedPreviewPath } from '../preview-policy.js';
+const DEFAULT_HOST = '127.0.0.1';
+const DEFAULT_MAX_FILE_BYTES = 50 * 1024 * 1024;
+const DEFAULT_MAX_CONCURRENT_READS = 16;
+export async function startPreviewServer(opts) {
+    const requestedRoot = path.resolve(opts.dir);
+    const root = await realpath(requestedRoot).catch(() => requestedRoot);
+    const rootStat = await stat(root).catch(() => null);
+    if (!rootStat?.isDirectory()) {
+        throw new Error(`Directory not found: ${root}`);
+    }
+    const host = validateHost(opts.host ?? DEFAULT_HOST, opts.allowNetwork === true);
+    const maxFileBytes = positiveLimit(opts.maxFileBytes, DEFAULT_MAX_FILE_BYTES, 'file size');
+    const maxConcurrentReads = positiveLimit(opts.maxConcurrentReads, DEFAULT_MAX_CONCURRENT_READS, 'concurrent request');
+    let activeRequests = 0;
+    const server = createServer((req, res) => {
+        const address = server.address();
+        const port = typeof address === 'object' && address ? address.port : opts.port;
+        if (!isAllowedPreviewRequestAuthority(req.headers.host, host, port)) {
+            sendText(res, 421, 'Misdirected request', req.method === 'HEAD');
+            return;
+        }
+        if (activeRequests >= maxConcurrentReads) {
+            sendText(res, 503, 'Server busy', req.method === 'HEAD');
+            return;
+        }
+        activeRequests += 1;
+        handlePreviewRequest(req, res, root, opts.theme, maxFileBytes)
+            .catch(() => sendText(res, 500, 'Internal server error', req.method === 'HEAD'))
+            .finally(() => {
+            activeRequests -= 1;
+        });
+    });
+    await new Promise((resolve, reject) => {
+        server.once('error', reject);
+        server.listen(opts.port, host, () => {
+            server.off('error', reject);
+            resolve();
+        });
+    });
+    const address = server.address();
+    const port = typeof address === 'object' && address ? address.port : opts.port;
+    return { server, root, host, url: `http://${urlHost(host)}:${port}/` };
+}
 export const serveCommand = new Command('serve')
     .description('Start a local dev server for previewing markdown files')
     .option('-p, --port <port>', 'port to listen on', '3000')
     .option('-d, --dir <dir>', 'directory to serve', '.')
-    .action((opts) => {
-    console.error(`serve command is not yet implemented. Would serve ${opts.dir} on port ${opts.port}.`);
-    console.error('This will be implemented in a future release.');
+    .option('-t, --theme <id>', 'Squisq theme ID to apply')
+    .option('--host <host>', 'interface to bind (loopback by default)', DEFAULT_HOST)
+    .option('--allow-network', 'allow a non-loopback --host')
+    .action(async (opts) => {
+    try {
+        const server = await startPreviewServer({
+            port: parsePort(opts.port),
+            dir: opts.dir,
+            theme: opts.theme,
+            host: opts.host,
+            allowNetwork: opts.allowNetwork,
+        });
+        console.error(`Serving ${server.root} at ${server.url}`);
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        console.error(`Error: ${message}`);
+        process.exitCode = 1;
+    }
 });
+async function handlePreviewRequest(req, res, root, themeId, maxFileBytes) {
+    if (req.method !== 'GET' && req.method !== 'HEAD') {
+        sendText(res, 405, 'Method not allowed');
+        return;
+    }
+    const headOnly = req.method === 'HEAD';
+    const target = await resolveServeTarget(root, req.url ?? '/', maxFileBytes);
+    if (target.kind === 'bad-request') {
+        sendText(res, 400, 'Bad request', headOnly);
+        return;
+    }
+    if (target.kind === 'forbidden') {
+        sendText(res, 403, 'Forbidden', headOnly);
+        return;
+    }
+    if (target.kind === 'missing') {
+        sendText(res, 404, 'Not found', headOnly);
+        return;
+    }
+    if (target.kind === 'too-large') {
+        sendText(res, 413, 'File too large', headOnly);
+        return;
+    }
+    if (target.markdown) {
+        const markdown = (await readContainedFile(root, target.filePath, maxFileBytes)).toString('utf8');
+        const html = await renderMarkdownHtml(markdown, {
+            title: path.basename(target.filePath).replace(/\.(md|markdown)$/i, ''),
+            sourcePath: target.filePath,
+            assetRoot: root,
+            themeId,
+            mode: 'static',
+            allowReferencedAsset: ({ assetRoot, requestedPath, physicalPath }) => isAllowedPreviewPath(assetRoot, requestedPath, physicalPath, 'embedded-image'),
+        });
+        sendBody(res, 200, html, 'text/html; charset=utf-8', headOnly);
+        return;
+    }
+    const body = await readContainedFile(root, target.filePath, maxFileBytes);
+    sendBody(res, 200, body, contentTypeFor(target.filePath), headOnly);
+}
+export async function resolveServeTarget(root, requestUrl, maxFileBytes = DEFAULT_MAX_FILE_BYTES) {
+    if (requestUrl.length > 8192 || requestUrl.includes('\0'))
+        return { kind: 'bad-request' };
+    const physicalRoot = await realpath(path.resolve(root)).catch(() => null);
+    if (!physicalRoot)
+        return { kind: 'missing' };
+    const decodedPath = decodeRequestPath(requestUrl);
+    if (!decodedPath)
+        return { kind: 'bad-request' };
+    const requestedPath = decodedPath.replace(/^\/+/, '');
+    const candidate = path.resolve(physicalRoot, requestedPath);
+    if (!isAllowedPreviewPath(physicalRoot, candidate, candidate, 'directory')) {
+        return { kind: 'forbidden' };
+    }
+    const direct = await inspectTarget(physicalRoot, candidate, maxFileBytes);
+    if (direct.kind === 'file')
+        return direct;
+    if (direct.kind === 'forbidden' || direct.kind === 'too-large')
+        return direct;
+    if (direct.kind === 'directory') {
+        const dirIndex = await directoryIndexTarget(physicalRoot, direct.filePath, maxFileBytes);
+        if (dirIndex.kind !== 'missing')
+            return dirIndex;
+    }
+    if (/\.html?$/i.test(candidate)) {
+        const markdownTarget = await inspectTarget(physicalRoot, candidate.replace(/\.html?$/i, '.md'), maxFileBytes);
+        if (markdownTarget.kind !== 'directory' && markdownTarget.kind !== 'missing') {
+            return markdownTarget;
+        }
+    }
+    return { kind: 'missing' };
+}
+function decodeRequestPath(requestUrl) {
+    const pathOnly = requestUrl.split(/[?#]/, 1)[0] || '/';
+    try {
+        return decodeURIComponent(pathOnly);
+    }
+    catch {
+        return '';
+    }
+}
+async function inspectTarget(root, candidate, maxFileBytes) {
+    let physical;
+    try {
+        physical = await realpath(candidate);
+    }
+    catch {
+        return { kind: 'missing' };
+    }
+    const info = await stat(physical).catch(() => null);
+    if (!info)
+        return { kind: 'missing' };
+    if (info.isDirectory()) {
+        return isAllowedPreviewPath(root, candidate, physical, 'directory')
+            ? { kind: 'directory', filePath: physical }
+            : { kind: 'forbidden' };
+    }
+    if (!info.isFile())
+        return { kind: 'forbidden' };
+    if (!isAllowedPreviewPath(root, candidate, physical, 'document-or-asset')) {
+        return { kind: 'forbidden' };
+    }
+    if (info.size > maxFileBytes)
+        return { kind: 'too-large' };
+    return { kind: 'file', filePath: physical, markdown: /\.(md|markdown)$/i.test(physical) };
+}
+async function directoryIndexTarget(root, dirPath, maxFileBytes) {
+    for (const fileName of ['index.html', 'index.htm', 'index.md', 'index.markdown']) {
+        const target = await inspectTarget(root, path.join(dirPath, fileName), maxFileBytes);
+        if (target.kind === 'file' || target.kind === 'forbidden' || target.kind === 'too-large') {
+            return target;
+        }
+    }
+    return { kind: 'missing' };
+}
+function parsePort(value) {
+    const port = Number(value);
+    if (!Number.isInteger(port) || port < 0 || port > 65535) {
+        throw new Error(`Invalid port: ${value}`);
+    }
+    return port;
+}
+function sendText(res, status, message, headOnly = false) {
+    sendBody(res, status, `${message}\n`, 'text/plain; charset=utf-8', headOnly);
+}
+function sendBody(res, status, body, contentType, headOnly) {
+    res.statusCode = status;
+    res.setHeader('content-type', contentType);
+    res.setHeader('x-content-type-options', 'nosniff');
+    res.setHeader('referrer-policy', 'no-referrer');
+    res.setHeader('cache-control', 'no-store');
+    if (headOnly) {
+        res.end();
+        return;
+    }
+    res.end(body);
+}
+function validateHost(value, allowNetwork) {
+    const rawHost = value.trim().toLowerCase();
+    const host = rawHost.startsWith('[') && rawHost.endsWith(']') ? rawHost.slice(1, -1) : rawHost;
+    if (!host ||
+        host.length > 255 ||
+        /[\s/\\\0]/.test(host) ||
+        (isIP(host) === 0 && !isValidHostname(host))) {
+        throw new Error('Invalid host');
+    }
+    if (!allowNetwork && !isLoopbackHost(host)) {
+        throw new Error('Non-loopback hosts require --allow-network');
+    }
+    return host;
+}
+function isLoopbackHost(host) {
+    if (host === 'localhost' || host === '::1')
+        return true;
+    const octets = host.split('.');
+    return (octets.length === 4 &&
+        octets[0] === '127' &&
+        octets.every((octet) => /^\d{1,3}$/.test(octet) && Number(octet) <= 255));
+}
+export function isAllowedPreviewRequestAuthority(header, configuredHost, configuredPort) {
+    const authority = parseRequestAuthority(header);
+    if (!authority || authority.port !== configuredPort)
+        return false;
+    if (configuredHost === '0.0.0.0')
+        return isIP(authority.host) === 4;
+    if (configuredHost === '::')
+        return isIP(authority.host) === 6;
+    return authority.host === configuredHost;
+}
+function parseRequestAuthority(header) {
+    if (!header || header.length > 512 || /[\s,\\/\0]/.test(header))
+        return null;
+    let host;
+    let portText = '';
+    let hasPortSeparator = false;
+    if (header.startsWith('[')) {
+        const closingBracket = header.indexOf(']');
+        if (closingBracket < 0)
+            return null;
+        host = header.slice(1, closingBracket).toLowerCase();
+        const remainder = header.slice(closingBracket + 1);
+        if (remainder && !remainder.startsWith(':'))
+            return null;
+        hasPortSeparator = remainder.startsWith(':');
+        portText = remainder.slice(1);
+        if (isIP(host) !== 6)
+            return null;
+    }
+    else {
+        const separator = header.lastIndexOf(':');
+        if (separator >= 0) {
+            if (header.indexOf(':') !== separator)
+                return null;
+            hasPortSeparator = true;
+            host = header.slice(0, separator).toLowerCase();
+            portText = header.slice(separator + 1);
+        }
+        else {
+            host = header.toLowerCase();
+        }
+        if (isIP(host) === 0 && !isValidHostname(host))
+            return null;
+    }
+    if (hasPortSeparator && !/^\d{1,5}$/.test(portText))
+        return null;
+    const port = portText ? Number(portText) : 80;
+    if (!Number.isInteger(port) || port < 1 || port > 65535)
+        return null;
+    return { host, port };
+}
+function isValidHostname(host) {
+    return (host.length <= 253 &&
+        !host.endsWith('.') &&
+        host.split('.').every((label) => /^(?!-)[a-z0-9-]{1,63}(?<!-)$/.test(label)));
+}
+function urlHost(host) {
+    return host.includes(':') && !host.startsWith('[') ? `[${host}]` : host;
+}
+function positiveLimit(value, fallback, label) {
+    const selected = value ?? fallback;
+    if (!Number.isSafeInteger(selected) || selected < 1)
+        throw new Error(`Invalid ${label} limit`);
+    return selected;
+}
+function contentTypeFor(filePath) {
+    const ext = path.extname(filePath).toLowerCase();
+    switch (ext) {
+        case '.html':
+        case '.htm':
+            return 'text/html; charset=utf-8';
+        case '.css':
+            return 'text/css; charset=utf-8';
+        case '.js':
+        case '.mjs':
+            return 'text/javascript; charset=utf-8';
+        case '.json':
+            return 'application/json; charset=utf-8';
+        case '.svg':
+            return 'image/svg+xml';
+        case '.png':
+            return 'image/png';
+        case '.jpg':
+        case '.jpeg':
+            return 'image/jpeg';
+        case '.gif':
+            return 'image/gif';
+        case '.webp':
+            return 'image/webp';
+        case '.ico':
+            return 'image/x-icon';
+        case '.woff':
+            return 'font/woff';
+        case '.woff2':
+            return 'font/woff2';
+        case '.ttf':
+            return 'font/ttf';
+        case '.otf':
+            return 'font/otf';
+        case '.mp3':
+            return 'audio/mpeg';
+        case '.wav':
+            return 'audio/wav';
+        case '.ogg':
+            return 'audio/ogg';
+        case '.mp4':
+            return 'video/mp4';
+        case '.webm':
+            return 'video/webm';
+        default:
+            return 'application/octet-stream';
+    }
+}
 //# sourceMappingURL=serve.js.map

package/dist/commands/serve.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC;KAC7C,WAAW,CAAC,wDAAwD,CAAC;KACrE,MAAM,CAAC,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,CAAC;KACxD,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,EAAE,GAAG,CAAC;KACpD,MAAM,CAAC,CAAC,IAAmC,EAAE,EAAE;IAC9C,OAAO,CAAC,KAAK,CACX,qDAAqD,IAAI,CAAC,GAAG,YAAY,IAAI,CAAC,IAAI,GAAG,CACtF,CAAC;IACF,OAAO,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":"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"}

package/dist/commands/themes.js

@@ -9,7 +9,7 @@ export const themesCommand = new Command('themes')
     const themes = getAvailableThemes();
     console.error('Available themes:\n');
     for (const theme of themes) {
-        process.stdout.write(`  ${theme}\n`);
+        process.stdout.write(`${theme}\n`);
     }
 });
 //# sourceMappingURL=themes.js.map

package/dist/commands/themes.js.map

@@ -1 +1 @@
-{"version":3,"file":"themes.js","sourceRoot":"","sources":["../../src/commands/themes.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC;KAC/C,WAAW,CAAC,kCAAkC,CAAC;KAC/C,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACzE,MAAM,MAAM,GAAG,kBAAkB,EAAE,CAAC;IACpC,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACrC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;IACvC,CAAC;AACH,CAAC,CAAC,CAAC"}
+{"version":3,"file":"themes.js","sourceRoot":"","sources":["../../src/commands/themes.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC;KAC/C,WAAW,CAAC,kCAAkC,CAAC;KAC/C,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACzE,MAAM,MAAM,GAAG,kBAAkB,EAAE,CAAC;IACpC,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACrC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;IACrC,CAAC;AACH,CAAC,CAAC,CAAC"}

package/dist/commands/transforms.js

@@ -9,7 +9,7 @@ export const transformsCommand = new Command('transforms')
     const styles = getTransformStyleIds();
     console.error('Available transform styles:\n');
     for (const style of styles) {
-        process.stdout.write(`  ${style}\n`);
+        process.stdout.write(`${style}\n`);
     }
 });
 //# sourceMappingURL=transforms.js.map

package/dist/commands/transforms.js.map

@@ -1 +1 @@
-{"version":3,"file":"transforms.js","sourceRoot":"","sources":["../../src/commands/transforms.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,OAAO,CAAC,YAAY,CAAC;KACvD,WAAW,CAAC,qCAAqC,CAAC;KAClD,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;IAC7E,MAAM,MAAM,GAAG,oBAAoB,EAAE,CAAC;IACtC,OAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAC/C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;IACvC,CAAC;AACH,CAAC,CAAC,CAAC"}
+{"version":3,"file":"transforms.js","sourceRoot":"","sources":["../../src/commands/transforms.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,OAAO,CAAC,YAAY,CAAC;KACvD,WAAW,CAAC,qCAAqC,CAAC;KAClD,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;IAC7E,MAAM,MAAM,GAAG,oBAAoB,EAAE,CAAC;IACtC,OAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAC/C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;IACrC,CAAC;AACH,CAAC,CAAC,CAAC"}

package/dist/commands/video.d.ts

@@ -16,16 +16,23 @@ export interface VideoOptions {
     captions?: CaptionOption;
     width?: number;
     height?: number;
+    /** Cancel input preparation, browser capture, or FFmpeg encoding. */
+    signal?: AbortSignal;
 }
 export interface VideoResult {
     outputPath: string;
     duration: number;
     frameCount: number;
 }
+type RenderDocToMp4 = typeof import('@bendyline/squisq-cli/api').renderDocToMp4;
+export interface VideoRunDependencies {
+    /** Test/programmatic override; production uses the linked Squisq renderer. */
+    renderDocToMp4?: RenderDocToMp4;
+}
 /**
  * Core video rendering logic — reusable by both CLI and MCP tools.
  */
-export declare function runVideo(inputPath: string, opts: VideoOptions, onProgress?: (phase: string, percent: number) => void): Promise<VideoResult>;
+export declare function runVideo(inputPath: string, opts: VideoOptions, onProgress?: (phase: string, percent: number) => void, dependencies?: VideoRunDependencies): Promise<VideoResult>;
 export declare const videoCommand: Command;
 export {};
 //# sourceMappingURL=video.d.ts.map

package/dist/commands/video.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"video.d.ts","sourceRoot":"","sources":["../../src/commands/video.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAI9E,QAAA,MAAM,cAAc,wCAAyC,CAAC;AAE9D,KAAK,aAAa,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAErD,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,YAAY,EAClB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GACpD,OAAO,CAAC,WAAW,CAAC,CAoFtB;AAYD,eAAO,MAAM,YAAY,SAsCrB,CAAC"}
+{"version":3,"file":"video.d.ts","sourceRoot":"","sources":["../../src/commands/video.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAI9E,QAAA,MAAM,cAAc,wCAAyC,CAAC;AAE9D,KAAK,aAAa,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAErD,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qEAAqE;IACrE,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,cAAc,GAAG,cAAc,2BAA2B,EAAE,cAAc,CAAC;AAEhF,MAAM,WAAW,oBAAoB;IACnC,8EAA8E;IAC9E,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,YAAY,EAClB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,EACrD,YAAY,GAAE,oBAAyB,GACtC,OAAO,CAAC,WAAW,CAAC,CAsFtB;AAoBD,eAAO,MAAM,YAAY,SAkCrB,CAAC"}

package/dist/commands/video.js

@@ -13,10 +13,11 @@ const VALID_CAPTIONS = ['off', 'standard', 'social'];
 /**
  * Core video rendering logic — reusable by both CLI and MCP tools.
  */
-export async function runVideo(inputPath, opts, onProgress) {
+export async function runVideo(inputPath, opts, onProgress, dependencies = {}) {
+    throwIfAborted(opts.signal);
     const resolvedInput = resolve(inputPath);
     const fps = opts.fps ?? 30;
-    if (fps < 1 || fps > 120) {
+    if (!Number.isFinite(fps) || fps < 1 || fps > 120) {
         throw new Error('FPS must be a number between 1 and 120');
     }
     const quality = opts.quality ?? 'normal';
@@ -40,25 +41,20 @@ export async function runVideo(inputPath, opts, onProgress) {
         ? resolve(opts.output)
         : resolve(dirname(resolvedInput), `${baseName}.mp4`);
     await mkdir(dirname(outputPath), { recursive: true });
+    throwIfAborted(opts.signal);
     console.error(`Reading: ${resolvedInput}`);
-    const { readInput, renderDocToMp4 } = await import('@bendyline/squisq-cli/api');
-    const result = await readInput(resolvedInput);
-    const { container } = result;
-    // Get or parse Doc
-    let doc;
-    if (result.doc) {
-        console.error('Using pre-built Doc JSON');
-        doc = result.doc;
-    }
-    else if (result.markdownDoc) {
-        const { markdownToDoc } = await import('@bendyline/squisq/doc');
-        doc = markdownToDoc(result.markdownDoc);
-    }
-    else {
-        throw new Error('No document found in input');
-    }
+    const squisq = await import('@bendyline/squisq-cli/api');
+    throwIfAborted(opts.signal);
+    const renderDocToMp4 = dependencies.renderDocToMp4 ?? squisq.renderDocToMp4;
+    const { readInput } = squisq;
+    const result = await readInput(resolvedInput, { signal: opts.signal });
+    throwIfAborted(opts.signal);
+    const { container, doc } = result;
+    console.error(`Using normalized ${result.sourceFormat} document`);
     console.error(`Rendering: ${fps} fps, quality: ${quality}, orientation: ${orientation}, captions: ${captions}`);
+    let latestProgress = 0;
     const renderResult = await renderDocToMp4(doc, container, {
+        signal: opts.signal,
         outputPath,
         fps,
         quality,
@@ -66,11 +62,20 @@ export async function runVideo(inputPath, opts, onProgress) {
         width: opts.width,
         height: opts.height,
         captionStyle,
-        onProgress: onProgress ??
-            ((phase, percent) => {
-                process.stderr.write(`\r  ${phase}: ${percent}%  `);
-            }),
+        onProgress: (phase, percent) => {
+            throwIfAborted(opts.signal);
+            const boundedPercent = Math.max(0, Math.min(100, percent));
+            if (boundedPercent < latestProgress)
+                return;
+            latestProgress = boundedPercent;
+            if (onProgress)
+                onProgress(phase, boundedPercent);
+            else
+                process.stderr.write(`\r  ${phase}: ${boundedPercent}%  `);
+            throwIfAborted(opts.signal);
+        },
     });
+    throwIfAborted(opts.signal);
     process.stderr.write('\r' + ' '.repeat(60) + '\r');
     console.error(`  ✓ ${outputPath}`);
     console.error(`  Duration: ${renderResult.duration.toFixed(1)}s, ${renderResult.frameCount} frames`);
@@ -81,15 +86,24 @@ export async function runVideo(inputPath, opts, onProgress) {
         frameCount: renderResult.frameCount,
     };
 }
+function throwIfAborted(signal) {
+    if (!signal?.aborted)
+        return;
+    if (signal.reason !== undefined)
+        throw signal.reason;
+    const error = new Error('Video rendering was cancelled');
+    error.name = 'AbortError';
+    throw error;
+}
 export const videoCommand = new Command('video')
     .description('Render a squisq document to MP4 video')
-    .argument('<input>', 'Path to .md file, .zip/.dbk container, or folder')
+    .argument('<input>', 'Path to a supported document, .zip/.dbk container, or folder')
     .argument('[output]', 'Output MP4 path (default: <input>.mp4)')
     .option('-o, --output <path>', 'Output MP4 path (default: <input>.mp4)')
-    .option('--fps <number>', 'Frames per second (default: 30)', '30')
-    .option('--quality <level>', `Encoding quality: ${VALID_QUALITIES.join(', ')} (default: normal)`, 'normal')
-    .option('--orientation <orient>', `Video orientation: ${VALID_ORIENTATIONS.join(', ')} (default: landscape)`, 'landscape')
-    .option('--captions <style>', `Caption style: ${VALID_CAPTIONS.join(', ')} (default: off)`, 'off')
+    .option('--fps <number>', 'Frames per second', '30')
+    .option('--quality <level>', `Encoding quality: ${VALID_QUALITIES.join(', ')}`, 'normal')
+    .option('--orientation <orient>', `Video orientation: ${VALID_ORIENTATIONS.join(', ')}`, 'landscape')
+    .option('--captions <style>', `Caption style: ${VALID_CAPTIONS.join(', ')}`, 'off')
     .option('--width <pixels>', 'Override video width')
     .option('--height <pixels>', 'Override video height')
     .action(async (inputPath, outputArg, opts) => {
@@ -99,12 +113,12 @@ export const videoCommand = new Command('video')
         }
         await runVideo(inputPath, {
             output: opts.output,
-            fps: parseInt(opts.fps ?? '30', 10),
+            fps: parseNumberOption('--fps', opts.fps ?? '30'),
             quality: opts.quality,
             orientation: opts.orientation,
             captions: opts.captions,
-            width: opts.width ? parseInt(opts.width, 10) : undefined,
-            height: opts.height ? parseInt(opts.height, 10) : undefined,
+            width: opts.width ? parseNumberOption('--width', opts.width) : undefined,
+            height: opts.height ? parseNumberOption('--height', opts.height) : undefined,
         });
     }
     catch (err) {
@@ -113,4 +127,10 @@ export const videoCommand = new Command('video')
         process.exitCode = 1;
     }
 });
+function parseNumberOption(name, value) {
+    const parsed = Number(value);
+    if (!Number.isFinite(parsed))
+        throw new Error(`${name} must be a finite number`);
+    return parsed;
+}
 //# sourceMappingURL=video.js.map