appshot-cli 1.0.2 → 2.0.0

package/dist/commands/wizard.js

@@ -0,0 +1,366 @@
+import { Command } from 'commander';
+import pc from 'picocolors';
+import inquirer from 'inquirer';
+import { spawn } from 'child_process';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { promises as fs } from 'fs';
+import { loadConfig, saveConfig, fileExists } from '../core/files.js';
+import { detectConfigVersion } from '../utils/config-version.js';
+import { showV1DeprecationBanner } from '../utils/v2-banner.js';
+import { translationService } from '../services/translation.js';
+import { applyTemplateToConfig, getTemplate, resolveTemplateId, templates } from '../templates/registry.js';
+import { getImageDimensions } from '../core/devices.js';
+const DEFAULT_LANGS = 'en,es,fr';
+const DEFAULT_MODEL = 'gpt-5-mini';
+export default function wizardCmd() {
+    const cmd = new Command('wizard')
+        .description('One-shot v2 setup and build flow')
+        .option('--devices <list>', 'comma-separated device list (iphone,ipad,mac,watch)')
+        .option('--layout <mode>', 'layout mode (header, footer, screenshot-only)')
+        .option('--template <id>', 'apply a v2 template (ocean-header, sunset-footer, clean-screenshot, etc.)')
+        .option('--caption-source <mode>', 'filenames or manual')
+        .option('--langs <codes>', 'language codes (comma-separated)')
+        .option('--model <name>', 'OpenAI model to use', DEFAULT_MODEL)
+        .option('--enhance', 'enhance captions after translation')
+        .option('--no-enhance', 'skip caption enhancement')
+        .option('--no-interactive', 'run without prompts (use flags)')
+        .option('--dry-run', 'print actions without executing')
+        .option('--migrate', 'auto-migrate v1 config to v2')
+        .option('--require-ai', 'fail if AI steps are requested but no API key is set')
+        .addHelpText('after', `
+${pc.bold('Examples:')}
+  ${pc.dim('# Interactive wizard')}
+  $ appshot wizard
+
+  ${pc.dim('# Interactive with template')}
+  $ appshot wizard --template ocean-header
+
+  ${pc.dim('# Non-interactive (CI)')}
+  $ appshot wizard --no-interactive --devices iphone --template ocean-header --caption-source filenames --langs en,es,fr --model gpt-5-mini
+
+${pc.bold('Notes:')}
+  • If OPENAI_API_KEY is missing, translation/enhance steps are skipped unless --require-ai is set.
+  • Manual captions require interactive entry per file.`)
+        .action(async (opts) => {
+        try {
+            await runWizard(opts);
+        }
+        catch (error) {
+            console.error(pc.red('Error:'), error instanceof Error ? error.message : String(error));
+            process.exit(1);
+        }
+    });
+    return cmd;
+}
+export async function runWizard(options, deps = {}) {
+    const runner = deps.runner ?? runCli;
+    const interactive = !options.noInteractive;
+    const plan = {
+        devices: [],
+        layout: options.layout ?? 'header',
+        templateId: options.template,
+        captionSource: options.captionSource ?? 'filenames',
+        langs: options.langs ?? DEFAULT_LANGS,
+        model: options.model ?? DEFAULT_MODEL,
+        enhance: options.noEnhance ? false : (options.enhance ?? true)
+    };
+    if (interactive) {
+        const answers = await inquirer.prompt([
+            {
+                type: 'checkbox',
+                name: 'devices',
+                message: 'Which devices?',
+                choices: [
+                    { name: 'iPhone', value: 'iphone', checked: true },
+                    { name: 'iPad', value: 'ipad' },
+                    { name: 'Mac', value: 'mac' },
+                    { name: 'Watch', value: 'watch' }
+                ],
+                validate: (values) => (values.length > 0 ? true : 'Select at least one device')
+            },
+            {
+                type: 'list',
+                name: 'templateId',
+                message: 'Use a template preset?',
+                choices: [
+                    { name: 'No template (custom)', value: '' },
+                    ...templates.map(template => ({
+                        name: `${template.name} — ${template.description}`,
+                        value: template.id
+                    }))
+                ],
+                default: plan.templateId || ''
+            },
+            {
+                type: 'list',
+                name: 'layout',
+                message: 'Layout mode:',
+                choices: [
+                    { name: 'Header (caption on top)', value: 'header' },
+                    { name: 'Footer (caption on bottom)', value: 'footer' },
+                    { name: 'Screenshot-only', value: 'screenshot-only' }
+                ],
+                default: plan.layout,
+                when: (answers) => !answers.templateId
+            },
+            {
+                type: 'list',
+                name: 'captionSource',
+                message: 'Caption source:',
+                choices: [
+                    { name: 'Filenames (auto)', value: 'filenames' },
+                    { name: 'Manual entry', value: 'manual' }
+                ],
+                default: plan.captionSource
+            },
+            {
+                type: 'confirm',
+                name: 'localize',
+                message: 'Localize captions to other languages?',
+                default: true
+            },
+            {
+                type: 'checkbox',
+                name: 'langs',
+                message: 'Select languages:',
+                choices: translationService.getSupportedLanguages().map(lang => ({
+                    name: `${lang.code} — ${lang.name}`,
+                    value: lang.code,
+                    checked: DEFAULT_LANGS.split(',').includes(lang.code)
+                })),
+                when: (answers) => answers.localize,
+                validate: (values) => {
+                    const normalized = (values || []).map(value => {
+                        if (typeof value === 'string')
+                            return value.toLowerCase();
+                        if (value && typeof value === 'object' && 'value' in value) {
+                            return String(value.value ?? '').toLowerCase();
+                        }
+                        return String(value ?? '').toLowerCase();
+                    }).filter(Boolean);
+                    if (normalized.length === 0) {
+                        return 'Select at least one language';
+                    }
+                    if (!normalized.some(code => code === 'en' || code.startsWith('en-'))) {
+                        return 'English (en) is required as the base language';
+                    }
+                    return true;
+                }
+            },
+            {
+                type: 'confirm',
+                name: 'enhance',
+                message: 'Enhance captions (rewrite to be shorter/clearer and fit layout limits)?',
+                default: plan.enhance
+            },
+            {
+                type: 'input',
+                name: 'model',
+                message: 'OpenAI model:',
+                default: plan.model,
+                when: (answers) => Boolean(answers.localize) || Boolean(answers.enhance)
+            }
+        ]);
+        plan.devices = answers.devices;
+        plan.templateId = answers.templateId || undefined;
+        plan.layout = answers.layout || plan.layout;
+        plan.captionSource = answers.captionSource;
+        plan.langs = answers.localize ? answers.langs.join(',') : 'en';
+        plan.enhance = answers.enhance;
+        plan.model = answers.model || plan.model;
+    }
+    else {
+        plan.devices = options.devices ? options.devices.split(',').map(d => d.trim()).filter(Boolean) : ['iphone'];
+    }
+    if (plan.devices.length === 0) {
+        throw new Error('No devices selected.');
+    }
+    if (plan.templateId) {
+        const resolved = resolveTemplateId(plan.templateId);
+        const template = getTemplate(resolved.id);
+        if (!template) {
+            throw new Error(`Template "${plan.templateId}" not found.`);
+        }
+        plan.templateId = resolved.id;
+        plan.layout = template.layout;
+        if (options.layout) {
+            console.log(pc.yellow('⚠'), `Template "${template.name}" sets layout to "${template.layout}" (ignoring --layout).`);
+        }
+    }
+    const needsAi = plan.langs.split(',').length > 1 || plan.enhance;
+    const hasApiKey = !!process.env.OPENAI_API_KEY;
+    if (needsAi && !hasApiKey) {
+        if (options.requireAi) {
+            throw new Error('OPENAI_API_KEY is required for translation/enhancement.');
+        }
+        console.log(pc.yellow('⚠'), 'OPENAI_API_KEY not found. Skipping translation/enhancement.');
+        plan.langs = 'en';
+        plan.enhance = false;
+    }
+    const configExists = await fileExists(path.join(process.cwd(), '.appshot', 'config.json'));
+    if (!configExists) {
+        await maybeRun(runner, ['init'], options.dryRun);
+    }
+    let config;
+    try {
+        config = await loadConfig();
+    }
+    catch {
+        throw new Error('Could not load config. Run "appshot init" first.');
+    }
+    const version = detectConfigVersion(config);
+    if (version === 1) {
+        if (interactive && !options.migrate) {
+            showV1DeprecationBanner();
+            const confirm = await inquirer.prompt([{
+                    type: 'confirm',
+                    name: 'migrate',
+                    message: 'Migrate v1 config to v2 now?',
+                    default: true
+                }]);
+            if (!confirm.migrate) {
+                throw new Error('Wizard canceled. Run "appshot migrate" to upgrade.');
+            }
+        }
+        else if (!options.migrate) {
+            throw new Error('v1 config detected. Run "appshot migrate" or pass --migrate.');
+        }
+        await maybeRun(runner, ['migrate', '--yes'], options.dryRun);
+        config = await loadConfig();
+    }
+    if (config.version === 2) {
+        let nextConfig = config;
+        if (plan.templateId) {
+            nextConfig = applyTemplateToConfig(plan.templateId, nextConfig);
+        }
+        else {
+            nextConfig.layout = plan.layout;
+        }
+        await applyDetectedResolutions(nextConfig, plan.devices);
+        await saveConfig(nextConfig);
+    }
+    const langs = plan.langs;
+    const langList = langs.split(',').map(l => l.trim()).filter(Boolean);
+    const targetLangs = langList.filter(l => l !== 'en');
+    for (const device of plan.devices) {
+        if (plan.captionSource === 'filenames') {
+            const args = ['caption', '--device', device, '--auto-caption'];
+            if (targetLangs.length > 0) {
+                args.push('--translate', '--langs', targetLangs.join(','), '--model', plan.model);
+            }
+            await maybeRun(runner, args, options.dryRun);
+        }
+        else {
+            const args = ['caption', '--device', device];
+            if (targetLangs.length > 0) {
+                args.push('--translate', '--langs', targetLangs.join(','), '--model', plan.model);
+            }
+            await maybeRun(runner, args, options.dryRun);
+        }
+        if (plan.enhance) {
+            const enhanceArgs = ['caption', 'enhance', '--device', device, '--model', plan.model];
+            if (langList.length > 0) {
+                enhanceArgs.push('--langs', langList.join(','));
+            }
+            await maybeRun(runner, enhanceArgs, options.dryRun);
+        }
+    }
+    const buildArgs = ['build', '--devices', plan.devices.join(',')];
+    if (langList.length > 0) {
+        buildArgs.push('--langs', langList.join(','));
+    }
+    await maybeRun(runner, buildArgs, options.dryRun);
+}
+async function applyDetectedResolutions(config, devices) {
+    const targetDevices = devices.length > 0 ? devices : Object.keys(config.devices);
+    for (const device of targetDevices) {
+        const entry = config.devices[device];
+        if (!entry)
+            continue;
+        const input = typeof entry === 'string' ? entry : entry.input;
+        const inputDir = path.resolve(process.cwd(), input);
+        try {
+            const files = (await fs.readdir(inputDir))
+                .filter(f => f.match(/\.(png|jpg|jpeg)$/i))
+                .sort();
+            if (files.length === 0) {
+                if (typeof entry === 'object' && 'resolution' in entry) {
+                    delete entry.resolution;
+                }
+                continue;
+            }
+            const sample = path.join(inputDir, files[0]);
+            const { width, height } = await getImageDimensions(sample);
+            if (!width || !height) {
+                continue;
+            }
+            const resolution = `${width}x${height}`;
+            if (typeof entry === 'string') {
+                config.devices[device] = { input, resolution };
+            }
+            else {
+                entry.resolution = resolution;
+            }
+            console.log(pc.dim(`Detected ${device} resolution: ${resolution}`));
+        }
+        catch {
+            if (typeof entry === 'object' && 'resolution' in entry) {
+                delete entry.resolution;
+            }
+        }
+    }
+}
+async function maybeRun(runner, args, dryRun) {
+    if (dryRun) {
+        console.log(pc.dim(`• Would run: appshot ${args.join(' ')}`));
+        return;
+    }
+    await runner(args);
+}
+function resolveCliEntry() {
+    const currentFile = fileURLToPath(import.meta.url);
+    const dir = path.dirname(currentFile);
+    const pathParts = dir.split(path.sep);
+    const isDevMode = pathParts.includes('src');
+    if (isDevMode) {
+        return path.resolve(dir, '../cli.ts');
+    }
+    return path.resolve(dir, '../cli.js');
+}
+function getCliCommand() {
+    const entry = resolveCliEntry();
+    if (entry.endsWith('.ts')) {
+        return {
+            execPath: process.execPath,
+            args: [path.resolve(path.dirname(entry), '../node_modules/.bin/tsx'), entry]
+        };
+    }
+    return {
+        execPath: process.execPath,
+        args: [entry]
+    };
+}
+function runCli(args, opts) {
+    return new Promise((resolve, reject) => {
+        const cli = getCliCommand();
+        const child = spawn(cli.execPath, [...cli.args, ...args], {
+            cwd: opts?.cwd ?? process.cwd(),
+            stdio: 'inherit',
+            env: {
+                ...process.env,
+                FORCE_COLOR: '1'
+            }
+        });
+        child.once('error', (error) => reject(error));
+        child.once('close', (code) => {
+            if (code === 0) {
+                resolve();
+            }
+            else {
+                reject(new Error(`Command failed: appshot ${args.join(' ')}`));
+            }
+        });
+    });
+}
+//# sourceMappingURL=wizard.js.map

package/dist/commands/wizard.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wizard.js","sourceRoot":"","sources":["../../src/commands/wizard.ts"],"names":[],"mappings":"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"}

package/dist/core/compose.d.ts

@@ -1,4 +1,4 @@
-import type { GradientConfig, CaptionConfig, DeviceConfig, BackgroundConfig } from '../types.js';
+import type { GradientConfig, CaptionConfig, DeviceConfig, BackgroundConfig, CaptionConfigV2, LayoutModeV2, DeviceStrategyV2 } from '../types.js';
 export interface LayoutDebugInfo {
     mode: 'above' | 'below' | 'overlay';
     framePosition: string | number | undefined;
@@ -45,6 +45,65 @@ export interface ComposeOptions {
  * Compose a complete App Store screenshot with gradient, caption, and framed device
  */
 export declare function composeAppStoreScreenshot(options: ComposeOptions): Promise<Buffer>;
+export interface LayoutV2DebugInfo {
+    layout: LayoutModeV2;
+    usable: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    caption?: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    device: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    deviceFit?: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        scale: number;
+    };
+    fontSize?: number;
+    captionTruncated?: boolean;
+}
+export interface ComposeV2Options {
+    screenshot: Buffer;
+    frame?: Buffer | null;
+    frameMetadata?: {
+        frameWidth: number;
+        frameHeight: number;
+        screenRect: {
+            x: number;
+            y: number;
+            width: number;
+            height: number;
+        };
+        maskPath?: string;
+        deviceType?: 'iphone' | 'ipad' | 'mac' | 'watch';
+        displayName?: string;
+        name?: string;
+    };
+    caption?: string;
+    captionConfig: CaptionConfigV2;
+    backgroundConfig?: BackgroundConfig;
+    outputWidth: number;
+    outputHeight: number;
+    layout: LayoutModeV2;
+    deviceType: DeviceStrategyV2['deviceType'];
+    deviceInputPath?: string;
+    verbose?: boolean;
+    onDebug?: (info: LayoutV2DebugInfo) => void;
+}
+export declare function composeV2(options: ComposeV2Options): Promise<Buffer>;
 /**
  * Compose a framed device with a fully transparent background.
  * No gradient or captions are applied; output is frame-sized.

package/dist/core/compose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/core/compose.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/core/compose.ts"],"names":[],"mappings":"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"}

package/dist/core/compose.js

@@ -7,6 +7,10 @@ import { applyRoundedCorners } from './mask-generator.js';
 import { calculateAdaptiveCaptionHeight, wrapText } from './text-utils.js';
 import { FontService } from '../services/fonts.js';
 import { resolveLayoutSpacing } from './layout-utils.js';
+import { computeFontSize, computeRegions } from './layouts/math.js';
+import { fitBoxToRegion } from './layouts/device-fit.js';
+import { layoutCaptionText } from './layouts/text-layout.js';
+import { getDeviceStrategyV2 } from './device-strategies/index.js';
 /**
  * Parse font name to extract style and weight
  */
@@ -119,6 +123,34 @@ function generateCaptionSVG(lines, width, height, fontSize, fontFamily, fontStyl
     ${svgElements.join('\n    ')}
   </svg>`;
 }
+function generateCaptionSvgV2(options) {
+    const { lines, width, height, fontSize, fontFamily, fontStyle, fontWeight, textColor, lineHeight, background } = options;
+    const svgElements = [];
+    if (background?.color) {
+        const opacity = background.opacity !== undefined ? background.opacity : 0.8;
+        svgElements.push(`<rect x="0" y="0" width="${width}" height="${height}" ` +
+            `fill="${background.color}" opacity="${opacity}"/>`);
+    }
+    const padding = Math.round(height * 0.1);
+    const innerHeight = Math.max(0, height - padding * 2);
+    const totalTextHeight = lines.length * fontSize * lineHeight;
+    const startY = padding + Math.max(fontSize, (innerHeight - totalTextHeight) / 2 + fontSize);
+    const centerX = Math.floor(width / 2);
+    const textElements = lines.map((line, index) => {
+        const y = startY + (index * fontSize * lineHeight);
+        return `<text x="${centerX}" y="${y}" ` +
+            `font-family="${fontFamily}" ` +
+            `font-size="${fontSize}" ` +
+            `font-style="${fontStyle}" ` +
+            `font-weight="${fontWeight}" ` +
+            `fill="${textColor}" ` +
+            `text-anchor="middle">${escapeXml(line)}</text>`;
+    });
+    svgElements.push(...textElements);
+    return `<svg width="${width}" height="${height}" xmlns="http://www.w3.org/2000/svg">
+    ${svgElements.join('\n    ')}
+  </svg>`;
+}
 /**
  * Compose a complete App Store screenshot with gradient, caption, and framed device
  */
@@ -991,6 +1023,124 @@ export async function composeAppStoreScreenshot(options) {
         .toBuffer();
     return result;
 }
+export async function composeV2(options) {
+    const { screenshot, frame, frameMetadata, caption, captionConfig, backgroundConfig, outputWidth, outputHeight, layout, deviceType, deviceInputPath, verbose = false, onDebug } = options;
+    const hasCaption = typeof caption === 'string' && caption.trim().length > 0;
+    const effectiveLayout = hasCaption ? layout : 'screenshot-only';
+    const strategy = getDeviceStrategyV2(deviceType);
+    const regions = computeRegions({ canvasWidth: outputWidth, canvasHeight: outputHeight, layout: effectiveLayout, strategy });
+    if (verbose) {
+        console.log(pc.dim('    v2 layout:'));
+        console.log(pc.dim(`      Layout: ${effectiveLayout}`));
+        if (!hasCaption && layout !== 'screenshot-only') {
+            console.log(pc.dim('      Layout override: no caption → screenshot-only'));
+        }
+        console.log(pc.dim(`      Usable: ${regions.usable.width}x${regions.usable.height} @ (${regions.usable.x}, ${regions.usable.y})`));
+        if (regions.caption) {
+            console.log(pc.dim(`      Caption: ${regions.caption.width}x${regions.caption.height} @ (${regions.caption.x}, ${regions.caption.y})`));
+        }
+        console.log(pc.dim(`      Device: ${regions.device.width}x${regions.device.height} @ (${regions.device.x}, ${regions.device.y})`));
+    }
+    let backgroundBuffer;
+    if (backgroundConfig) {
+        backgroundBuffer = await renderBackground(outputWidth, outputHeight, backgroundConfig, deviceInputPath || '');
+        if (backgroundConfig.warnOnMismatch && backgroundConfig.image) {
+            const validation = await validateBackgroundDimensions(backgroundConfig.image, outputWidth, outputHeight);
+            if (validation.warnings.length > 0) {
+                console.warn(pc.yellow('⚠️  Background dimension warnings:'));
+                validation.warnings.forEach(warning => {
+                    console.warn(pc.dim(`   ${warning}`));
+                });
+            }
+        }
+    }
+    else {
+        const defaultGradient = {
+            colors: ['#4A90E2', '#7B68EE'],
+            direction: 'top-bottom'
+        };
+        backgroundBuffer = await renderGradient(outputWidth, outputHeight, defaultGradient);
+    }
+    const composites = [];
+    let deviceFit;
+    if (frame && frameMetadata) {
+        const framedBuffer = await composeFrameOnly({
+            screenshot,
+            frame,
+            frameMetadata,
+            outputFormat: 'png',
+            verbose
+        });
+        deviceFit = fitBoxToRegion(frameMetadata.frameWidth, frameMetadata.frameHeight, regions.device);
+        const resizedFrame = await sharp(framedBuffer)
+            .resize(deviceFit.width, deviceFit.height, { fit: 'fill' })
+            .toBuffer();
+        composites.push({
+            input: resizedFrame,
+            left: deviceFit.x,
+            top: deviceFit.y
+        });
+    }
+    else {
+        const metadata = await sharp(screenshot).metadata();
+        const baseWidth = metadata.width || regions.device.width;
+        const baseHeight = metadata.height || regions.device.height;
+        deviceFit = fitBoxToRegion(baseWidth, baseHeight, regions.device);
+        const resizedScreenshot = await sharp(screenshot)
+            .resize(deviceFit.width, deviceFit.height, { fit: 'fill' })
+            .toBuffer();
+        composites.push({
+            input: resizedScreenshot,
+            left: deviceFit.x,
+            top: deviceFit.y
+        });
+    }
+    let captionTruncated = false;
+    let fontSize;
+    if (hasCaption && regions.caption && effectiveLayout !== 'screenshot-only') {
+        const screenHeight = frameMetadata?.screenRect.height || regions.device.height;
+        fontSize = computeFontSize(screenHeight, strategy);
+        const textLayout = layoutCaptionText(caption, regions.caption, fontSize, strategy);
+        captionTruncated = textLayout.truncated;
+        const parsedFont = parseFontName(captionConfig.font);
+        const fontFamily = getFontStack(parsedFont.family);
+        const fontStyle = parsedFont.style || 'normal';
+        const fontWeight = parsedFont.weight === 'bold' ? '700' : '400';
+        const svgText = generateCaptionSvgV2({
+            lines: textLayout.lines,
+            width: regions.caption.width,
+            height: regions.caption.height,
+            fontSize,
+            fontFamily,
+            fontStyle,
+            fontWeight,
+            textColor: captionConfig.color,
+            lineHeight: strategy.captionLineHeight,
+            background: captionConfig.background
+        });
+        const captionImage = await sharp(Buffer.from(svgText)).png().toBuffer();
+        composites.push({
+            input: captionImage,
+            left: regions.caption.x,
+            top: regions.caption.y
+        });
+        if (captionTruncated) {
+            console.warn(pc.yellow('⚠️  Caption truncated. Consider shortening the text.'));
+        }
+    }
+    if (onDebug) {
+        onDebug({
+            layout: effectiveLayout,
+            usable: regions.usable,
+            caption: regions.caption,
+            device: regions.device,
+            deviceFit,
+            fontSize,
+            captionTruncated
+        });
+    }
+    return sharp(backgroundBuffer).composite(composites).png().toBuffer();
+}
 /**
  * Compose a framed device with a fully transparent background.
  * No gradient or captions are applied; output is frame-sized.