@vscode/component-explorer-cli 0.2.1-1 → 0.2.1-10

package/dist/commands/mcpCommand.js

@@ -1,60 +1,131 @@
 import { Command, Option } from 'clipanion';
+import * as path from 'node:path';
 import '../external/vscode-observables/observables/dist/observableInternal/index.js';
+import { DisposableStore } from '../external/vscode-observables/observables/dist/disposables.js';
 import { observableValue } from '../external/vscode-observables/observables/dist/observableInternal/observables/observableValue.js';
 import '../external/vscode-observables/observables/dist/observableInternal/debugLocation.js';
 import '../external/vscode-observables/observables/dist/observableInternal/observables/derived.js';
 import '../external/vscode-observables/observables/dist/observableInternal/utils/utils.js';
 import '../external/vscode-observables/observables/dist/observableInternal/observables/observableFromEvent.js';
 import { tryConnect, connectToExistingOrStartDaemon } from '../daemon/lifecycle.js';
-import { daemonPipeName } from '../daemon/pipeName.js';
-import { ComponentExplorerMcpServer, DaemonConnection } from '../mcp/McpServer.js';
-import { resolveProject } from '../resolveProject.js';
+import { daemonPipeInfo } from '../daemon/pipeName.js';
+import { DaemonConnection, ComponentExplorerMcpServer } from '../mcp/McpServer.js';
+import { ResolvedConfig } from '../config.js';
+import { DaemonService } from '../daemon/DaemonService.js';
+import { createInProcessClient } from '../daemon/inProcessClient.js';
+import { ConsoleLogger, verbosityToLogLevel, createLogFileOptions, logBuildInfo } from '../logger.js';
 
 class McpCommand extends Command {
     static paths = [['mcp']];
     static usage = Command.Usage({
-        description: 'Start an MCP server over stdio. Auto-starts a daemon if not already running.',
+        description: 'Start an MCP server over stdio. By default runs as the daemon in-process.',
         examples: [
-            ['Start MCP server', '$0 mcp --project config.json'],
-            ['Require existing daemon', '$0 mcp --project config.json --no-daemon-autostart'],
+            ['Start MCP server (in-process daemon)', '$0 mcp --project config.json'],
+            ['Connect to external daemon', '$0 mcp --project config.json --use-daemon'],
+            ['Require existing daemon', '$0 mcp --project config.json --use-daemon --no-daemon-autostart'],
         ],
     });
+    verbose = Option.Counter('-v,--verbose', 0, { description: 'Increase log verbosity (-v debug, -vv trace)' });
+    logFile = Option.String('--log-file', { description: 'Append logs to this file (works with -v/-vv)' });
     project = Option.String('-p,--project', { required: true, description: 'Project: a directory, vite config file, or component-explorer.json' });
-    noAutostart = Option.Boolean('--no-daemon-autostart', false, { description: 'Do not auto-start daemon; poll for it instead' });
-    noAutostartHint = Option.String('--no-daemon-hint', { description: 'Hint message shown when daemon is not running (used with --no-daemon-autostart)' });
+    useDaemon = Option.Boolean('--use-daemon', false, { description: 'Connect to an external daemon process over a pipe instead of running in-process' });
+    noAutostart = Option.Boolean('--no-daemon-autostart', false, { description: 'Do not auto-start daemon; poll for it instead (requires --use-daemon)' });
+    noAutostartHint = Option.String('--no-daemon-hint', { description: 'Hint message shown when daemon is not running (used with --use-daemon --no-daemon-autostart)' });
     callTimeout = Option.String('--call-timeout', { description: 'Timeout in seconds for daemon calls (default: 15)' });
     async execute() {
-        const resolved = await resolveProject(this.project);
-        if (resolved.kind !== 'explorerConfig') {
+        const logger = new ConsoleLogger('mcp', this.context.stderr, verbosityToLogLevel(this.verbose), createLogFileOptions(this.logFile, this.verbose));
+        logBuildInfo(logger);
+        if (this.noAutostart && !this.useDaemon) {
+            this.context.stderr.write('Error: --no-daemon-autostart requires --use-daemon.\n');
+            return;
+        }
+        const disposables = new DisposableStore();
+        const config = await ResolvedConfig.fromProjectPath(this.project, disposables);
+        if (!config.isFullConfig) {
             this.context.stderr.write('Error: mcp requires a component-explorer.json config file.\n');
+            disposables.dispose();
             return;
         }
+        if (this.useDaemon) {
+            await this._runWithExternalDaemon(config, logger);
+        }
+        else {
+            await this._runInProcess(config, logger, disposables);
+        }
+    }
+    async _runInProcess(config, logger, disposables) {
+        logger.log('Starting in-process daemon...');
+        const service = await DaemonService.create(config, logger, undefined, {
+            idleTimeoutMs: 0, // no idle timeout for MCP — the MCP client controls lifetime
+        });
+        // Ensure cleanup on crashes/unexpected exits
+        let cleanedUp = false;
+        const cleanup = async () => {
+            if (cleanedUp) {
+                return;
+            }
+            cleanedUp = true;
+            logger.debug('Cleaning up...');
+            await service.dispose();
+            disposables.dispose();
+        };
+        process.on('uncaughtException', async (err) => {
+            logger.log(`Uncaught exception: ${err.message}`);
+            await cleanup();
+        });
+        process.on('unhandledRejection', async (err) => {
+            logger.log(`Unhandled rejection: ${err instanceof Error ? err.message : String(err)}`);
+            await cleanup();
+        });
+        process.on('SIGINT', async () => {
+            logger.debug('Received SIGINT');
+            await cleanup();
+            process.exit(0);
+        });
+        const client = createInProcessClient(service.api, { clientName: 'mcp-inproc' });
+        const daemonObservable = observableValue('daemon', new DaemonConnection(client));
+        await ComponentExplorerMcpServer.create(daemonObservable, {
+            callTimeoutMs: this.callTimeout ? Number(this.callTimeout) * 1000 : undefined,
+        });
+        logger.log('MCP server ready (in-process daemon)');
+        await new Promise(() => { });
+    }
+    async _runWithExternalDaemon(config, logger) {
         const daemonObservable = observableValue('daemon', undefined);
         const mcpClientName = `mcp-${new Date().toISOString().replace(/[-:]/g, '').replace(/\.\d+Z$/, '')}`;
-        const pipeName = daemonPipeName(resolved.configPath);
+        const configPath = path.resolve(this.project);
+        const { pipeName, source: pipeSource } = daemonPipeInfo(configPath);
+        logger.debug(`Daemon pipe: ${pipeName} (source: ${pipeSource})`);
         let restartInProgress = false;
         const pollFn = async () => {
             const client = await tryConnect(pipeName, { clientName: mcpClientName });
             if (client) {
                 const current = daemonObservable.get();
                 if (!current || current.isStale) {
+                    logger.debug(`Daemon connection established`);
                     daemonObservable.set(new DaemonConnection(client), undefined);
                 }
                 return;
             }
             const current = daemonObservable.get();
             if (current) {
+                logger.debug(`Daemon connection lost, will attempt restart`);
                 current.markStale();
                 daemonObservable.set(undefined, undefined);
             }
             if (!this.noAutostart && !restartInProgress) {
                 restartInProgress = true;
                 try {
-                    const daemon = await connectToExistingOrStartDaemon(resolved.configPath, { clientName: mcpClientName });
+                    const daemon = await connectToExistingOrStartDaemon(configPath, {
+                        clientName: mcpClientName,
+                        logger,
+                        verbosity: this.verbose,
+                        logFile: this.logFile,
+                    });
                     daemonObservable.set(new DaemonConnection(daemon), undefined);
                 }
-                catch {
-                    // Restart failed, will retry on next poll
+                catch (err) {
+                    logger.debug(`Daemon restart failed: ${err instanceof Error ? err.message : String(err)}`);
                 }
                 finally {
                     restartInProgress = false;
@@ -63,13 +134,12 @@ class McpCommand extends Command {
         };
         await pollFn();
         setInterval(pollFn, 5000);
-        // Create and connect the MCP server over stdio
         await ComponentExplorerMcpServer.create(daemonObservable, {
             pollFn,
             noAutostartHint: this.noAutostartHint,
             callTimeoutMs: this.callTimeout ? Number(this.callTimeout) * 1000 : undefined,
         });
-        // Keep the process alive until the MCP connection closes
+        logger.log('MCP server ready (external daemon)');
         await new Promise(() => { });
     }
 }

package/dist/commands/mcpCommand.js.map

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

package/dist/commands/{screenshotCommand.d.ts → renderCommand.d.ts}

@@ -1,8 +1,9 @@
 import { Command } from 'clipanion';
-export declare class ScreenshotCommand extends Command {
+export declare class RenderCommand extends Command {
     static paths: string[][];
     static usage: import("clipanion").Usage;
     readonly verbose: number;
+    readonly logFile: string | undefined;
     readonly filter: string | undefined;
     readonly accept: boolean;
     readonly project: string;
@@ -12,7 +13,8 @@ export declare class ScreenshotCommand extends Command {
     readonly report: string | undefined;
     readonly headed: boolean;
     readonly timeout: string;
+    readonly useHashPaths: boolean;
     execute(): Promise<number>;
     private _runComparison;
 }
-//# sourceMappingURL=screenshotCommand.d.ts.map
+//# sourceMappingURL=renderCommand.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"renderCommand.d.ts","sourceRoot":"","sources":["../../src/commands/renderCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAc5C,qBAAa,aAAc,SAAQ,OAAO;IACzC,OAAgB,KAAK,aAAgB;IAErC,OAAgB,KAAK,4BAOlB;IAEH,QAAQ,CAAC,OAAO,SAAsG;IACtH,QAAQ,CAAC,OAAO,qBAAgG;IAChH,QAAQ,CAAC,MAAM,qBAAkG;IACjH,QAAQ,CAAC,MAAM,UAAiI;IAChJ,QAAQ,CAAC,OAAO,SAAuI;IACvJ,QAAQ,CAAC,MAAM,qBAAsK;IACrL,QAAQ,CAAC,OAAO,UAA8F;IAC9G,QAAQ,CAAC,aAAa,qBAA+K;IACrM,QAAQ,CAAC,MAAM,qBAA4G;IAC3H,QAAQ,CAAC,MAAM,UAAwG;IACvH,QAAQ,CAAC,OAAO,SAA+G;IAC/H,QAAQ,CAAC,YAAY,UAA8J;IAE7K,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;YA+HlB,cAAc;CA+B5B"}

package/dist/commands/renderCommand.js

@@ -0,0 +1,210 @@
+import { Command, Option } from 'clipanion';
+import * as path from 'node:path';
+import { createHash } from 'node:crypto';
+import '../external/vscode-observables/observables/dist/observableInternal/index.js';
+import { DisposableStore } from '../external/vscode-observables/observables/dist/disposables.js';
+import '../external/vscode-observables/observables/dist/observableInternal/debugLocation.js';
+import '../external/vscode-observables/observables/dist/observableInternal/observables/derived.js';
+import '../external/vscode-observables/observables/dist/observableInternal/utils/utils.js';
+import '../external/vscode-observables/observables/dist/observableInternal/observables/observableFromEvent.js';
+import { PlaywrightBrowserPageFactory } from '../browserPage.js';
+import { compareScreenshotsInMemory, printComparisonToConsole, writeComparisonReport } from '../comparison.js';
+import { ConsoleLogger, verbosityToLogLevel, createLogFileOptions, logBuildInfo } from '../logger.js';
+import { ResolvedConfig } from '../config.js';
+import { ExplorerSession } from '../explorerSession.js';
+import { FileSystemStorage } from '../storage.js';
+import { matchGlob, writeFile } from '../utils.js';
+import { getGitRoot, execGit } from '../git/gitUtils.js';
+import { serializeManifest } from '../renderManifest.js';
+import { MANIFEST_FILENAME } from '../packages/common/dist/renderManifest.js';
+
+class RenderCommand extends Command {
+    static paths = [['render']];
+    static usage = Command.Usage({
+        description: 'Render screenshots of all fixtures and write a manifest',
+        examples: [
+            ['Render all fixtures', '$0 render'],
+            ['Render and accept as baseline', '$0 render --accept'],
+            ['Filter by glob', '$0 render --filter "Button/*"'],
+        ],
+    });
+    verbose = Option.Counter('-v,--verbose', 0, { description: 'Increase log verbosity (-v debug, -vv trace)' });
+    logFile = Option.String('--log-file', { description: 'Append logs to this file (works with -v/-vv)' });
+    filter = Option.String('--filter', { required: false, description: 'Filter fixtures by glob pattern' });
+    accept = Option.Boolean('--accept', false, { description: 'Write to baseline instead of current (mutually exclusive with --target)' });
+    project = Option.String('-p,--project', process.cwd(), { description: 'Project: a directory, vite config file, or component-explorer.json' });
+    target = Option.String('--target', { required: false, description: 'Screenshot output directory (default: .screenshots/current, or .screenshots/baseline with --accept)' });
+    compare = Option.Boolean('--compare', false, { description: 'Compare screenshots after capturing' });
+    compareTarget = Option.String('--compare-target', { required: false, description: 'Directory to compare against (default: .screenshots/baseline, or .screenshots/current with --accept)' });
+    report = Option.String('--report', { required: false, description: 'Output report folder (requires --compare)' });
+    headed = Option.Boolean('--headed', false, { description: 'Show the browser window (useful for debugging)' });
+    timeout = Option.String('--timeout', '30000', { description: 'Navigation timeout in milliseconds (default: 30000)' });
+    useHashPaths = Option.Boolean('--useHashPaths', false, { description: 'Use content-hash image paths (images/<hash>.png) for deduplication instead of fixture-id paths' });
+    async execute() {
+        // Validate mutually exclusive options
+        if (this.accept && this.target) {
+            this.context.stderr.write('Error: --accept and --target are mutually exclusive.\n');
+            return 1;
+        }
+        const logger = new ConsoleLogger('render', this.context.stdout, verbosityToLogLevel(this.verbose), createLogFileOptions(this.logFile, this.verbose));
+        logBuildInfo(logger);
+        const disposables = new DisposableStore();
+        const config = await ResolvedConfig.fromProjectPath(this.project, disposables);
+        const projectDir = config.configDir;
+        const serverConfig = config.sessions[0].server;
+        // Determine target directory
+        const defaultTarget = this.accept ? '.screenshots/baseline' : '.screenshots/current';
+        const targetDir = this.target ?? defaultTarget;
+        const targetPath = path.isAbsolute(targetDir) ? targetDir : path.join(projectDir, targetDir);
+        // Determine compare target directory
+        const defaultCompareTarget = this.accept ? '.screenshots/current' : '.screenshots/baseline';
+        const compareTargetDir = this.compareTarget ?? defaultCompareTarget;
+        const compareTargetPath = path.isAbsolute(compareTargetDir) ? compareTargetDir : path.join(projectDir, compareTargetDir);
+        const storage = new FileSystemStorage(targetPath);
+        const browserFactory = new PlaywrightBrowserPageFactory(this.headed, Number(this.timeout), logger);
+        const screenshots = new Map();
+        let session;
+        try {
+            this.context.stdout.write('Starting server...\n');
+            session = await ExplorerSession.create('render', serverConfig, browserFactory, { logger });
+            this.context.stdout.write(`Server running at ${session.serverUrl}\n`);
+            const listResult = await session.explorer.listFixtures();
+            if (listResult.loadError) {
+                this.context.stderr.write(`Warning: Fixture loading error: ${listResult.loadError}\n`);
+            }
+            const filtered = this.filter
+                ? listResult.fixtures.filter(f => matchGlob(f.fixtureId, this.filter))
+                : listResult.fixtures;
+            this.context.stdout.write(`Found ${filtered.length} fixture(s)\n`);
+            const fixtureEntries = [];
+            const writtenHashes = new Set();
+            for (const fixture of filtered) {
+                const result = await session.explorer.screenshotFixture(fixture.fixtureId);
+                let imageHash;
+                let imagePath;
+                if (result.image) {
+                    imageHash = createHash('sha256').update(result.image).digest('hex');
+                    if (this.useHashPaths) {
+                        imagePath = `images/${imageHash}.png`;
+                        if (!writtenHashes.has(imageHash)) {
+                            await storage.write(imagePath, result.image);
+                            writtenHashes.add(imageHash);
+                        }
+                    }
+                    else {
+                        imagePath = `${fixture.fixtureId}.png`;
+                        await storage.write(imagePath, result.image);
+                    }
+                    screenshots.set(fixture.fixtureId, { data: result.image, background: fixture.background, labels: fixture.labels });
+                }
+                fixtureEntries.push({
+                    fixtureId: fixture.fixtureId,
+                    imageHash,
+                    imagePath,
+                    background: fixture.background,
+                    labels: [...fixture.labels],
+                    expectedVisualDescriptions: [...fixture.expectedVisualDescriptions],
+                    hasError: result.hasError,
+                    error: result.error,
+                    events: result.events,
+                    renderTimeMs: result.renderTimeMs,
+                });
+                if (!result.image) {
+                    this.context.stderr.write(`  ✗ ${fixture.fixtureId} (no screenshot)\n`);
+                }
+                else if (result.hasError) {
+                    this.context.stdout.write(`  ⚠ ${fixture.fixtureId} (rendered with errors)\n`);
+                }
+                else {
+                    this.context.stdout.write(`  ✓ ${fixture.fixtureId}\n`);
+                }
+            }
+            const gitRoot = await getGitRoot(projectDir);
+            const commitMetadata = await collectGitMetadata(gitRoot);
+            const repoOrigin = await getRepoOwnerAndName(gitRoot);
+            const manifest = {
+                version: 1,
+                repository: repoOrigin,
+                commit: commitMetadata,
+                fixtures: fixtureEntries,
+            };
+            const manifestPath = path.join(targetPath, MANIFEST_FILENAME);
+            await writeFile(manifestPath, Buffer.from(serializeManifest(manifest)));
+            this.context.stdout.write(`\nRendered to ${targetDir}/\n`);
+            this.context.stdout.write(`  Manifest: ${manifestPath}\n`);
+            this.context.stdout.write(`  ${fixtureEntries.length} fixtures, ${writtenHashes.size} unique images\n`);
+        }
+        finally {
+            await session?.dispose();
+            await browserFactory.dispose();
+            disposables.dispose();
+        }
+        if (this.compare) {
+            this.context.stdout.write(`\nComparing against ${compareTargetDir}...\n`);
+            return this._runComparison(screenshots, targetPath, compareTargetPath, projectDir);
+        }
+        return 0;
+    }
+    async _runComparison(screenshots, targetPath, compareTargetPath, projectDir) {
+        const compareStorage = new FileSystemStorage(compareTargetPath);
+        const result = await compareScreenshotsInMemory(screenshots, {
+            list: async () => [],
+            read: (id) => compareStorage.read(id),
+            exists: (id) => compareStorage.exists(id),
+        });
+        printComparisonToConsole(result, this.context.stdout);
+        if (this.report) {
+            const reportDir = path.isAbsolute(this.report) ? this.report : path.join(projectDir, this.report);
+            await writeComparisonReport({
+                reportDir,
+                result,
+                baselinePath: compareTargetPath,
+                currentPath: targetPath,
+                getBaselineData: (id) => compareStorage.read(`${id}.png`),
+                getCurrentData: async (id) => screenshots.get(id).data,
+            });
+            this.context.stdout.write(`\nReport written to: ${this.report}/\n`);
+        }
+        return (result.added.length > 0 || result.changed.length > 0) ? 1 : 0;
+    }
+}
+async function collectGitMetadata(gitRoot) {
+    const hash = (await execGit(gitRoot, ['rev-parse', 'HEAD'])).trim();
+    const logOutput = (await execGit(gitRoot, [
+        'log', '-1', '--format=%an%n%ae%n%aI%n%s', 'HEAD',
+    ])).trim();
+    const [authorName, authorEmail, timestamp, ...messageParts] = logOutput.split('\n');
+    let parentHashes = [];
+    try {
+        const parentOutput = (await execGit(gitRoot, ['rev-parse', 'HEAD^@'])).trim();
+        if (parentOutput) {
+            parentHashes = parentOutput.split('\n').map(s => s.trim()).filter(Boolean);
+        }
+    }
+    catch {
+        // root commit has no parents
+    }
+    return {
+        hash,
+        parentHashes,
+        author: { name: authorName, email: authorEmail },
+        timestamp,
+        message: messageParts.join('\n'),
+    };
+}
+async function getRepoOwnerAndName(gitRoot) {
+    try {
+        const remoteUrl = (await execGit(gitRoot, ['remote', 'get-url', 'origin'])).trim();
+        const match = remoteUrl.match(/[:/]([^/]+)\/([^/.]+?)(?:\.git)?$/);
+        if (match) {
+            return { owner: match[1], name: match[2] };
+        }
+    }
+    catch {
+        // no remote configured
+    }
+    return { owner: 'unknown', name: path.basename(gitRoot) };
+}
+
+export { RenderCommand };
+//# sourceMappingURL=renderCommand.js.map

package/dist/commands/renderCommand.js.map

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

package/dist/commands/serveCommand.d.ts

@@ -3,6 +3,7 @@ export declare class ServeCommand extends Command {
     static paths: string[][];
     static usage: import("clipanion").Usage;
     readonly verbose: number;
+    readonly logFile: string | undefined;
     readonly project: string;
     readonly background: boolean;
     readonly attach: boolean;
@@ -11,6 +12,7 @@ export declare class ServeCommand extends Command {
     readonly headed: boolean;
     readonly redirectionPort: string | undefined;
     readonly redirectionHost: string | undefined;
+    readonly idleTimeoutMs: string;
     execute(): Promise<void>;
     private _killExistingAndWait;
     private _ensureBackground;

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

@@ -1 +1 @@
-{"version":3,"file":"serveCommand.d.ts","sourceRoot":"","sources":["../../src/commands/serveCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAiB5C,qBAAa,YAAa,SAAQ,OAAO;IACxC,OAAgB,KAAK,aAAe;IAEpC,OAAgB,KAAK,4BAkBlB;IAEH,QAAQ,CAAC,OAAO,SAAsG;IACtH,QAAQ,CAAC,OAAO,SAAwI;IACxJ,QAAQ,CAAC,UAAU,UAAoG;IACvH,QAAQ,CAAC,MAAM,UAAsG;IACrH,QAAQ,CAAC,IAAI,UAAkF;IAC/F,QAAQ,CAAC,aAAa,UAAqH;IAC3I,QAAQ,CAAC,MAAM,UAAwG;IACvH,QAAQ,CAAC,eAAe,qBAA8H;IACtJ,QAAQ,CAAC,eAAe,qBAAsH;IAExI,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YA6DhB,oBAAoB;YAkBpB,iBAAiB;YA4DjB,OAAO;IAgBrB,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,WAAW;YAeL,YAAY;IAuC1B,OAAO,CAAC,uBAAuB;CAyB/B"}
+{"version":3,"file":"serveCommand.d.ts","sourceRoot":"","sources":["../../src/commands/serveCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAiB5C,qBAAa,YAAa,SAAQ,OAAO;IACxC,OAAgB,KAAK,aAAe;IAEpC,OAAgB,KAAK,4BAkBlB;IAEH,QAAQ,CAAC,OAAO,SAAsG;IACtH,QAAQ,CAAC,OAAO,qBAAgG;IAChH,QAAQ,CAAC,OAAO,SAAwI;IACxJ,QAAQ,CAAC,UAAU,UAAoG;IACvH,QAAQ,CAAC,MAAM,UAAsG;IACrH,QAAQ,CAAC,IAAI,UAAkF;IAC/F,QAAQ,CAAC,aAAa,UAAqH;IAC3I,QAAQ,CAAC,MAAM,UAAwG;IACvH,QAAQ,CAAC,eAAe,qBAA8H;IACtJ,QAAQ,CAAC,eAAe,qBAAsH;IAC9I,QAAQ,CAAC,aAAa,SAA0J;IAE1K,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YA+DhB,oBAAoB;YAkBpB,iBAAiB;YA8DjB,OAAO;IAiBrB,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,WAAW;YAeL,YAAY;IA6D1B,OAAO,CAAC,uBAAuB;CAyB/B"}