vaulter 0.2.1 → 0.3.1

package/dist/cli/commands/set.js

@@ -1,31 +1,133 @@
 /**
  * Vaulter CLI - Set Command
  *
- * Set an environment variable (create or update)
+ * Set environment variables (supports batch operations)
+ *
+ * Syntax options:
+ *   vaulter set KEY "value" -e dev          # Legacy single-key syntax (secret)
+ *   vaulter set KEY=value -e dev            # Secret (encrypted, file + backend)
+ *   vaulter set KEY:=123 -e dev             # Secret typed (number/boolean)
+ *   vaulter set KEY::value -e dev           # Config (plain text, file only)
+ *   vaulter set K1=v1 K2::v2 -e dev         # Batch: mix secrets and configs
+ *   vaulter set KEY=val @tag:db,secret      # With metadata (@ prefix)
  */
+import fs from 'node:fs';
+import path from 'node:path';
 import { createClientFromConfig } from '../lib/create-client.js';
+import { findConfigDir, getSecretsFilePath, getConfigsFilePath, getEnvFilePath, getEnvFilePathForConfig } from '../../lib/config-loader.js';
+import { parseEnvFile, serializeEnv } from '../../lib/env-parser.js';
 /**
  * Check if this is a production environment and confirm if needed
  */
 function isProdEnvironment(env) {
     return env === 'prd' || env === 'dr';
 }
+/**
+ * Check if config uses split mode
+ */
+function isSplitMode(config) {
+    return config?.directories?.mode === 'split';
+}
+/**
+ * Build variables map from args (handles legacy, secrets, and configs)
+ */
+function buildVariablesMaps(context) {
+    const { args, secrets: secretsBucket, configs: configsBucket } = context;
+    const secrets = new Map();
+    const configs = new Map();
+    // 1. Secrets from separator syntax (KEY=value)
+    for (const [key, value] of Object.entries(secretsBucket)) {
+        secrets.set(key, String(value));
+    }
+    // 2. Configs from separator syntax (KEY:value)
+    for (const [key, value] of Object.entries(configsBucket)) {
+        configs.set(key, String(value));
+    }
+    // 3. Legacy syntax (positional args: KEY "value") → treated as secret
+    const legacyKey = args._[1];
+    const legacyValue = args._[2];
+    if (legacyKey && legacyValue !== undefined) {
+        secrets.set(legacyKey, String(legacyValue));
+    }
+    return { secrets, configs };
+}
+/**
+ * Extract metadata from meta bucket
+ *
+ * Supports:
+ *   @tag:sensitive,database     → ['sensitive', 'database'] (comma-separated)
+ *   @tags:auth,secret           → ['auth', 'secret']
+ *   @owner:backend              → stored in metadata.owner
+ *   @description:my-var         → stored in metadata.description
+ */
+function extractMetadata(meta) {
+    const tags = [];
+    let owner;
+    let description;
+    for (const [key, value] of Object.entries(meta)) {
+        const strValue = String(value);
+        if (key === 'tag' || key === 'tags') {
+            // Support comma-separated tags: @tag:sensitive,database,secret
+            const tagList = strValue.split(',').map(t => t.trim()).filter(t => t.length > 0);
+            tags.push(...tagList);
+        }
+        else if (key === 'owner') {
+            owner = strValue;
+        }
+        else if (key === 'description' || key === 'desc') {
+            description = strValue;
+        }
+        else {
+            // Unknown meta keys become tags: @foo:bar → tag 'foo:bar'
+            tags.push(`${key}:${strValue}`);
+        }
+    }
+    return { tags, owner, description };
+}
+/**
+ * Write variables to a .env file (append/update)
+ */
+function writeToEnvFile(filePath, variables, verbose) {
+    // Ensure directory exists
+    const dir = path.dirname(filePath);
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
+    // Load existing vars if file exists
+    let existing = {};
+    if (fs.existsSync(filePath)) {
+        existing = parseEnvFile(filePath);
+    }
+    // Merge new variables
+    for (const [key, value] of variables) {
+        existing[key] = value;
+    }
+    // Write back
+    const content = serializeEnv(existing);
+    fs.writeFileSync(filePath, content + '\n');
+    if (verbose) {
+        console.error(`[vaulter] Wrote ${variables.size} variables to ${filePath}`);
+    }
+}
 /**
  * Run the set command
  */
 export async function runSet(context) {
-    const { args, config, project, service, environment, verbose, dryRun, jsonOutput } = context;
-    // Get key and value from positional args
-    const key = args._[1];
-    const value = args._[2];
-    if (!key) {
-        console.error('Error: Key name is required');
-        console.error('Usage: vaulter set <key> <value> [-e <env>]');
-        process.exit(1);
-    }
-    if (value === undefined) {
-        console.error('Error: Value is required');
-        console.error('Usage: vaulter set <key> <value> [-e <env>]');
+    const { args, config, project, service, environment, verbose, dryRun, jsonOutput, meta } = context;
+    // Build variables maps (secrets and configs)
+    const { secrets, configs } = buildVariablesMaps(context);
+    // Extract metadata from meta bucket (@tag:x @owner:y @desc:z)
+    const { tags, owner, description } = extractMetadata(meta);
+    const totalVars = secrets.size + configs.size;
+    if (totalVars === 0) {
+        console.error('Error: No variables specified');
+        console.error('');
+        console.error('Usage:');
+        console.error('  vaulter set KEY "value" -e dev                  # Single secret');
+        console.error('  vaulter set KEY=value -e dev                    # Secret (encrypted)');
+        console.error('  vaulter set KEY::value -e dev                   # Config (plain text)');
+        console.error('  vaulter set K1=v1 K2::v2 PORT:=3000             # Batch: mix secrets & configs');
+        console.error('  vaulter set KEY=val @tag:db,secret @owner:team  # With metadata');
         process.exit(1);
     }
     if (!project) {
@@ -39,55 +141,199 @@ export async function runSet(context) {
         console.error('Use --force to confirm this action');
         process.exit(1);
     }
+    const splitMode = isSplitMode(config);
+    const configDir = findConfigDir();
     if (verbose) {
-        console.error(`Setting ${key} for ${project}/${service || '(no service)'}/${environment}`);
+        console.error(`Mode: ${splitMode ? 'split' : 'unified'}`);
+        if (secrets.size > 0)
+            console.error(`Secrets: ${[...secrets.keys()].join(', ')}`);
+        if (configs.size > 0)
+            console.error(`Configs: ${[...configs.keys()].join(', ')}`);
     }
+    // Dry run output
     if (dryRun) {
+        const result = {
+            action: 'set',
+            mode: splitMode ? 'split' : 'unified',
+            project,
+            service,
+            environment,
+            dryRun: true
+        };
+        if (secrets.size > 0) {
+            result.secrets = {
+                count: secrets.size,
+                keys: [...secrets.keys()],
+                destination: splitMode ? 'deploy/secrets + backend' : 'backend'
+            };
+        }
+        if (configs.size > 0) {
+            result.configs = {
+                count: configs.size,
+                keys: [...configs.keys()],
+                destination: splitMode ? 'deploy/configs (file only)' : 'backend'
+            };
+        }
+        if (tags.length > 0 || owner || description) {
+            result.metadata = { tags: tags.length > 0 ? tags : undefined, owner, description };
+        }
         if (jsonOutput) {
-            console.log(JSON.stringify({
-                action: 'set',
-                key,
-                project,
-                service,
-                environment,
-                dryRun: true
-            }));
+            console.log(JSON.stringify(result));
         }
         else {
-            console.log(`Dry run - would set ${key} in ${project}/${environment}`);
+            if (secrets.size > 0) {
+                console.log(`Dry run - would set ${secrets.size} secret(s):`);
+                for (const key of secrets.keys()) {
+                    const dest = splitMode ? 'secrets file + backend' : 'backend';
+                    console.log(`  ${key} → ${dest}`);
+                }
+            }
+            if (configs.size > 0) {
+                console.log(`Dry run - would set ${configs.size} config(s):`);
+                for (const key of configs.keys()) {
+                    const dest = splitMode ? 'configs file (no backend)' : 'backend';
+                    console.log(`  ${key} → ${dest}`);
+                }
+            }
+            if (tags.length > 0)
+                console.log(`  [tags: ${tags.join(', ')}]`);
+            if (owner)
+                console.log(`  [owner: ${owner}]`);
         }
         return;
     }
-    const client = await createClientFromConfig({ args, config, verbose });
-    try {
-        await client.connect();
-        const envVar = await client.set({
-            key,
-            value,
-            project,
-            service,
-            environment,
-            metadata: {
-                source: 'manual'
+    // Results tracking
+    const results = [];
+    // === HANDLE SECRETS (file + backend) ===
+    if (secrets.size > 0) {
+        // Write to secrets file in split mode
+        if (splitMode && configDir) {
+            const secretsFilePath = getSecretsFilePath(config, configDir, environment);
+            writeToEnvFile(secretsFilePath, secrets, verbose);
+        }
+        // Sync secrets to backend
+        const client = await createClientFromConfig({ args, config, verbose });
+        try {
+            await client.connect();
+            for (const [key, value] of secrets) {
+                try {
+                    await client.set({
+                        key,
+                        value,
+                        project,
+                        service,
+                        environment,
+                        tags: tags.length > 0 ? tags : undefined,
+                        metadata: {
+                            source: 'manual',
+                            ...(owner && { owner }),
+                            ...(description && { description })
+                        }
+                    });
+                    results.push({ key, type: 'secret', success: true });
+                    if (!jsonOutput) {
+                        console.log(`✓ Set secret ${key} in ${project}/${environment}`);
+                    }
+                }
+                catch (err) {
+                    results.push({ key, type: 'secret', success: false, error: err.message });
+                    if (!jsonOutput) {
+                        console.error(`✗ Failed to set secret ${key}: ${err.message}`);
+                    }
+                }
+            }
+        }
+        finally {
+            await client.disconnect();
+        }
+    }
+    // === HANDLE CONFIGS (file only, no backend) ===
+    if (configs.size > 0) {
+        if (splitMode && configDir) {
+            // Split mode: write to configs file only
+            const configsFilePath = getConfigsFilePath(config, configDir, environment);
+            writeToEnvFile(configsFilePath, configs, verbose);
+            for (const key of configs.keys()) {
+                results.push({ key, type: 'config', success: true });
+                if (!jsonOutput) {
+                    console.log(`✓ Set config ${key} in ${configsFilePath}`);
+                }
+            }
+        }
+        else if (configDir) {
+            // Unified mode: write configs to the single env file + backend
+            // Use getEnvFilePathForConfig to respect directories.path if configured
+            const envFilePath = config
+                ? getEnvFilePathForConfig(config, configDir, environment)
+                : getEnvFilePath(configDir, environment);
+            writeToEnvFile(envFilePath, configs, verbose);
+            // Also sync to backend in unified mode
+            const client = await createClientFromConfig({ args, config, verbose });
+            try {
+                await client.connect();
+                for (const [key, value] of configs) {
+                    try {
+                        await client.set({
+                            key,
+                            value,
+                            project,
+                            service,
+                            environment,
+                            tags: tags.length > 0 ? tags : undefined,
+                            metadata: {
+                                source: 'manual',
+                                ...(owner && { owner }),
+                                ...(description && { description })
+                            }
+                        });
+                        results.push({ key, type: 'config', success: true });
+                        if (!jsonOutput) {
+                            console.log(`✓ Set config ${key} in ${project}/${environment}`);
+                        }
+                    }
+                    catch (err) {
+                        results.push({ key, type: 'config', success: false, error: err.message });
+                        if (!jsonOutput) {
+                            console.error(`✗ Failed to set config ${key}: ${err.message}`);
+                        }
+                    }
+                }
+            }
+            finally {
+                await client.disconnect();
             }
-        });
-        if (jsonOutput) {
-            console.log(JSON.stringify({
-                success: true,
-                key: envVar.key,
-                project: envVar.project,
-                service: envVar.service,
-                environment: envVar.environment,
-                createdAt: envVar.createdAt,
-                updatedAt: envVar.updatedAt
-            }));
         }
         else {
-            console.log(`✓ Set ${key} in ${project}/${environment}`);
+            console.error('Error: No config directory found');
+            process.exit(1);
         }
     }
-    finally {
-        await client.disconnect();
+    // Calculate final results
+    const successful = results.filter(r => r.success).length;
+    const failed = results.filter(r => !r.success).length;
+    // JSON output summary
+    if (jsonOutput) {
+        console.log(JSON.stringify({
+            success: failed === 0,
+            results,
+            summary: {
+                total: results.length,
+                successful,
+                failed,
+                secrets: secrets.size,
+                configs: configs.size
+            },
+            project,
+            service,
+            environment
+        }));
+    }
+    else if (totalVars > 1) {
+        console.log(`\n${successful}/${totalVars} variables set successfully`);
+    }
+    // Exit with error code if any failures occurred
+    if (failed > 0) {
+        process.exit(1);
     }
 }
 //# sourceMappingURL=set.js.map

package/dist/cli/commands/set.js.map

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

package/dist/cli/commands/sync.d.ts

@@ -1,8 +1,9 @@
 /**
  * Vaulter CLI - Sync Command
  *
- * Bidirectional sync between local .env file and backend
- * with conflict detection
+ * Merge local .env file with backend storage
+ * Local changes are pushed to remote, remote-only keys are pulled to local
+ * Conflict handling is configurable (local wins by default)
  */
 import type { CLIArgs, VaulterConfig, Environment } from '../../types.js';
 interface SyncContext {

package/dist/cli/commands/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/sync.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAc,MAAM,gBAAgB,CAAA;AASrF,UAAU,WAAW;IACnB,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE,aAAa,GAAG,IAAI,CAAA;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,WAAW,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,OAAO,CAAA;IACf,UAAU,EAAE,OAAO,CAAA;CACpB;AA4MD;;GAEG;AACH,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAiGjE"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/sync.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAc,MAAM,gBAAgB,CAAA;AASrF,UAAU,WAAW;IACnB,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE,aAAa,GAAG,IAAI,CAAA;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,WAAW,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,OAAO,CAAA;IACf,UAAU,EAAE,OAAO,CAAA;CACpB;AA+MD;;GAEG;AACH,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAiGjE"}

package/dist/cli/commands/sync.js

@@ -1,14 +1,15 @@
 /**
  * Vaulter CLI - Sync Command
  *
- * Bidirectional sync between local .env file and backend
- * with conflict detection
+ * Merge local .env file with backend storage
+ * Local changes are pushed to remote, remote-only keys are pulled to local
+ * Conflict handling is configurable (local wins by default)
  */
 import fs from 'node:fs';
 import path from 'node:path';
 import { createClientFromConfig } from '../lib/create-client.js';
 import { runHook } from '../lib/hooks.js';
-import { findConfigDir, getEnvFilePath } from '../../lib/config-loader.js';
+import { findConfigDir, getEnvFilePathForConfig } from '../../lib/config-loader.js';
 import { parseEnvFile, hasStdinData, parseEnvFromStdin, serializeEnv } from '../../lib/env-parser.js';
 import { compileGlobPatterns } from '../../lib/pattern-matcher.js';
 import { discoverServices, filterServices, findMonorepoRoot, formatServiceList } from '../../lib/monorepo.js';
@@ -51,12 +52,14 @@ async function syncSingleService(context, serviceInfo) {
             resolvedPath = path.resolve(filePath);
         }
         else {
-            // Default to .vaulter/environments/<env>.env
+            // Default path depends on directories.mode:
+            // - unified: .vaulter/environments/<env>.env
+            // - split: deploy/secrets/<env>.env
             const configDir = serviceInfo?.configDir || findConfigDir();
             if (!configDir) {
                 throw new Error('No config directory found and no file specified');
             }
-            resolvedPath = getEnvFilePath(configDir, environment);
+            resolvedPath = getEnvFilePathForConfig(effectiveConfig, configDir, environment);
         }
         if (!fs.existsSync(resolvedPath)) {
             throw new Error(`File not found: ${resolvedPath}`);
@@ -127,9 +130,6 @@ async function syncSingleService(context, serviceInfo) {
             }
             if (remoteValue !== undefined) {
                 if (!canUpdateLocal) {
-                    if (conflictMode === 'remote' || conflictMode === 'prompt' || conflictMode === 'error') {
-                        conflicts.push({ key, localValue: '', remoteValue });
-                    }
                     syncVars[key] = remoteValue;
                     continue;
                 }
@@ -138,18 +138,22 @@ async function syncSingleService(context, serviceInfo) {
                 syncVars[key] = remoteValue;
             }
         }
+        // Check for blocking conflicts first (before required check)
+        // This prevents "missing required" errors for keys that are actually in conflict
+        const isBlockingConflict = conflictMode === 'error' && conflicts.length > 0;
+        if (isBlockingConflict && !dryRun) {
+            const conflictKeyNames = conflicts.map(c => c.key).join(', ');
+            throw new Error(`Sync conflicts detected: ${conflictKeyNames}`);
+        }
+        // Now check for missing required keys
+        // Exclude keys that are in conflicts (they exist but have value mismatches)
+        const conflictKeySet = new Set(conflicts.map(c => c.key));
         const missingRequired = requiredKeys
             .filter(key => !isIgnored(key))
-            .filter(key => !(key in syncVars));
+            .filter(key => !(key in syncVars) && !conflictKeySet.has(key));
         if (missingRequired.length > 0) {
             throw new Error(`Missing required keys for ${environment}: ${missingRequired.join(', ')}`);
         }
-        const isBlockingConflict = (conflictMode === 'prompt' || conflictMode === 'error') &&
-            conflicts.length > 0;
-        if (isBlockingConflict && !dryRun) {
-            const conflictKeys = conflicts.map(c => c.key).join(', ');
-            throw new Error(`Sync conflicts detected: ${conflictKeys}`);
-        }
         if (!dryRun) {
             if (canUpdateLocal && envFilePath && (localAdded.length > 0 || localUpdated.length > 0)) {
                 const envContent = serializeEnv(mergedVars);
@@ -326,7 +330,6 @@ async function runBatchSync(context) {
     const batchResult = await runBatch(services, environment, async (service, env) => {
         return syncSingleService({ ...context, config: service.config }, service);
     }, {
-        verbose,
         onProgress: verbose ? (completed, total, current) => {
             console.error(`[${completed + 1}/${total}] Syncing ${current.name}...`);
         } : undefined

package/dist/cli/commands/sync.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/cli/commands/sync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/cli/commands/sync.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAA;AACnF,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACrG,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,EAAoB,MAAM,uBAAuB,CAAA;AAC/H,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AAa9F;;GAEG;AACH,SAAS,iBAAiB,CAAC,GAAgB;IACzC,OAAO,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,IAAI,CAAA;AACtC,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,iBAAiB,CAC9B,OAAoB,EACpB,WAAyB;IAEzB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAEhF,4CAA4C;IAC5C,MAAM,eAAe,GAAG,WAAW,EAAE,MAAM,IAAI,MAAM,CAAA;IACrD,MAAM,gBAAgB,GAAG,WAAW,EAAE,MAAM,CAAC,OAAO,IAAI,OAAO,CAAA;IAC/D,MAAM,gBAAgB,GAAG,WAAW,EAAE,IAAI,IAAI,OAAO,CAAA;IACrD,MAAM,UAAU,GAAG,eAAe,EAAE,IAAI,CAAA;IACxC,MAAM,YAAY,GAAG,UAAU,EAAE,QAAQ,IAAI,OAAO,CAAA;IACpD,MAAM,cAAc,GAAG,UAAU,EAAE,MAAM,IAAI,EAAE,CAAA;IAC/C,MAAM,YAAY,GAAG,UAAU,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,CAAA;IAC9D,MAAM,SAAS,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAA;IAErD,gCAAgC;IAChC,IAAI,SAAiC,CAAA;IACrC,IAAI,WAAW,GAAkB,IAAI,CAAA;IAErC,IAAI,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC;QACnC,iDAAiD;QACjD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;QAClD,CAAC;QACD,SAAS,GAAG,MAAM,iBAAiB,EAAE,CAAA;IACvC,CAAC;SAAM,CAAC;QACN,iBAAiB;QACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAA;QACpC,IAAI,YAAoB,CAAA;QAExB,IAAI,QAAQ,IAAI,CAAC,WAAW,EAAE,CAAC;YAC7B,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACvC,CAAC;aAAM,CAAC;YACN,4CAA4C;YAC5C,6CAA6C;YAC7C,oCAAoC;YACpC,MAAM,SAAS,GAAG,WAAW,EAAE,SAAS,IAAI,aAAa,EAAE,CAAA;YAC3D,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;YACpE,CAAC;YACD,YAAY,GAAG,uBAAuB,CAAC,eAAgB,EAAE,SAAS,EAAE,WAAW,CAAC,CAAA;QAClF,CAAC;QAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,mBAAmB,YAAY,EAAE,CAAC,CAAA;QACpD,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,KAAK,CAAC,0BAA0B,YAAY,EAAE,CAAC,CAAA;QACzD,CAAC;QAED,WAAW,GAAG,YAAY,CAAA;QAC1B,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,CAAA;IACxC,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,KAAK,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,kBAAkB,CAAC,CAAA;IACzE,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,CAAC,eAAe,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC,CAAA;IAEvF,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;QAEtB,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAA;QAEvF,MAAM,UAAU,GAAG,EAAE,GAAG,SAAS,EAAE,CAAA;QACnC,MAAM,QAAQ,GAA2B,EAAE,CAAA;QAC3C,MAAM,KAAK,GAAa,EAAE,CAAA;QAC1B,MAAM,OAAO,GAAa,EAAE,CAAA;QAC5B,MAAM,SAAS,GAAa,EAAE,CAAA;QAC9B,MAAM,UAAU,GAAa,EAAE,CAAA;QAC/B,MAAM,YAAY,GAAa,EAAE,CAAA;QACjC,MAAM,SAAS,GAA4B,EAAE,CAAA;QAC7C,MAAM,cAAc,GAAG,CAAC,CAAC,WAAW,CAAA;QAEpC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAS;YAC9B,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YACzB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;SAC3B,CAAC,CAAA;QAEF,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnB,SAAQ;YACV,CAAC;YAED,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,CAAA;YACjC,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;YAEnC,IAAI,UAAU,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC1D,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;oBAC/B,QAAQ,CAAC,GAAG,CAAC,GAAG,UAAU,CAAA;oBAC1B,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;oBACnB,SAAQ;gBACV,CAAC;gBAED,IAAI,YAAY,KAAK,OAAO,EAAE,CAAC;oBAC7B,QAAQ,CAAC,GAAG,CAAC,GAAG,UAAU,CAAA;oBAC1B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;oBACjB,SAAQ;gBACV,CAAC;gBAED,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;oBAC9B,IAAI,CAAC,cAAc,EAAE,CAAC;wBACpB,SAAS,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAA;wBAChD,SAAQ;oBACV,CAAC;oBACD,UAAU,CAAC,GAAG,CAAC,GAAG,WAAW,CAAA;oBAC7B,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;oBACtB,QAAQ,CAAC,GAAG,CAAC,GAAG,WAAW,CAAA;oBAC3B,SAAQ;gBACV,CAAC;gBAED,SAAS,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAA;gBAChD,SAAQ;YACV,CAAC;YAED,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,QAAQ,CAAC,GAAG,CAAC,GAAG,UAAU,CAAA;gBAC1B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACf,SAAQ;YACV,CAAC;YAED,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC9B,IAAI,CAAC,cAAc,EAAE,CAAC;oBACpB,QAAQ,CAAC,GAAG,CAAC,GAAG,WAAW,CAAA;oBAC3B,SAAQ;gBACV,CAAC;gBACD,UAAU,CAAC,GAAG,CAAC,GAAG,WAAW,CAAA;gBAC7B,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACpB,QAAQ,CAAC,GAAG,CAAC,GAAG,WAAW,CAAA;YAC7B,CAAC;QACH,CAAC;QAED,6DAA6D;QAC7D,iFAAiF;QACjF,MAAM,kBAAkB,GAAG,YAAY,KAAK,OAAO,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;QAE3E,IAAI,kBAAkB,IAAI,CAAC,MAAM,EAAE,CAAC;YAClC,MAAM,gBAAgB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC7D,MAAM,IAAI,KAAK,CAAC,4BAA4B,gBAAgB,EAAE,CAAC,CAAA;QACjE,CAAC;QAED,sCAAsC;QACtC,4EAA4E;QAC5E,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QACzD,MAAM,eAAe,GAAG,YAAY;aACjC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;aAC9B,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;QAEhE,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,6BAA6B,WAAW,KAAK,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC5F,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,cAAc,IAAI,WAAW,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;gBACxF,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC,CAAA;gBAC3C,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,UAAU,GAAG,IAAI,CAAC,CAAA;YAClD,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;gBACzC,MAAM,MAAM,CAAC,GAAG,CAAC;oBACf,GAAG;oBACH,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC;oBACpB,OAAO,EAAE,gBAAgB;oBACzB,WAAW;oBACX,OAAO,EAAE,gBAAgB;oBACzB,QAAQ,EAAE;wBACR,MAAM,EAAE,MAAM;qBACf;iBACF,CAAC,CAAA;YACJ,CAAC;YAED,OAAO,CAAC,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA;QAClE,CAAC;QAED,OAAO;YACL,KAAK;YACL,OAAO;YACP,OAAO,EAAE,EAAE;YACX,SAAS;YACT,SAAS;YACT,UAAU;YACV,YAAY;SACb,CAAA;IACH,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,UAAU,EAAE,CAAA;IAC3B,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAoB;IAChD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;IAE5F,4DAA4D;IAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAA;IAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAA;IAE5C,IAAI,WAAW,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAClE,MAAM,YAAY,CAAC,OAAO,CAAC,CAAA;QAC3B,OAAM;IACR,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAA;QACjE,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;QACxD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IAED,0BAA0B;IAC1B,IAAI,iBAAiB,CAAC,WAAW,CAAC,IAAI,MAAM,EAAE,QAAQ,EAAE,kBAAkB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1F,OAAO,CAAC,KAAK,CAAC,+BAA+B,WAAW,2BAA2B,CAAC,CAAA;QACpF,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAA;QACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAA;QAE/C,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;gBACzB,OAAO,EAAE,IAAI;gBACb,MAAM;gBACN,OAAO;gBACP,OAAO;gBACP,WAAW;gBACX,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,EAAE;gBACnC,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,EAAE;gBACvC,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,EAAE;aACxC,CAAC,CAAC,CAAA;QACL,CAAC;aAAM,IAAI,MAAM,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAA;YACpD,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,iBAAiB,MAAM,CAAC,KAAK,CAAC,MAAM,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAClF,CAAC;YACD,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9B,OAAO,CAAC,GAAG,CAAC,oBAAoB,MAAM,CAAC,OAAO,CAAC,MAAM,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACzF,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzC,OAAO,CAAC,GAAG,CAAC,gBAAgB,MAAM,CAAC,UAAU,EAAE,MAAM,MAAM,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAC7F,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3C,OAAO,CAAC,GAAG,CAAC,mBAAmB,MAAM,CAAC,YAAY,EAAE,MAAM,MAAM,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACpG,CAAC;YACD,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,OAAO,CAAC,GAAG,CAAC,gBAAgB,MAAM,CAAC,SAAS,CAAC,MAAM,YAAY,CAAC,CAAA;YAClE,CAAC;YACD,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,OAAO,CAAC,GAAG,CAAC,gBAAgB,MAAM,CAAC,SAAS,CAAC,MAAM,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACzG,CAAC;YACD,IACE,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;gBACzB,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;gBAC3B,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC;gBACtC,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EACxC,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;YACpC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,YAAY,OAAO,IAAI,WAAW,EAAE,CAAC,CAAA;YACjD,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,mBAAmB,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACpF,CAAC;YACD,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9B,OAAO,CAAC,GAAG,CAAC,qBAAqB,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAC1F,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzC,OAAO,CAAC,GAAG,CAAC,kBAAkB,MAAM,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAC/F,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3C,OAAO,CAAC,GAAG,CAAC,oBAAoB,MAAM,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACrG,CAAC;YACD,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,OAAO,CAAC,GAAG,CAAC,gBAAgB,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;YACxD,CAAC;YACD,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,OAAO,CAAC,GAAG,CAAC,gBAAgB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAC5E,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,UAAW,GAAa,CAAC,OAAO,EAAE,CAAC,CAAA;QACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,YAAY,CAAC,OAAoB;IAC9C,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;IAElE,qBAAqB;IACrB,MAAM,IAAI,GAAG,gBAAgB,EAAE,CAAA;IAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAC7C,OAAO,CAAC,KAAK,CAAC,6EAA6E,CAAC,CAAA;QAC5F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IAED,oBAAoB;IACpB,IAAI,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;IAErC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;QACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IAED,uCAAuC;IACvC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAA;IAC5C,IAAI,aAAa,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QAC/B,QAAQ,GAAG,cAAc,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QAClD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,CAAC,KAAK,CAAC,qCAAqC,aAAa,EAAE,CAAC,CAAA;YACnE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YACjB,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;YACpC,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;YAC1C,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;gBAC9B,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;YAClC,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;IACH,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC1C,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IACnB,CAAC;IAED,oCAAoC;IACpC,IAAI,iBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAClD,OAAO,CAAC,KAAK,CAAC,4BAA4B,QAAQ,CAAC,MAAM,gBAAgB,WAAW,eAAe,CAAC,CAAA;QACpG,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAA;QACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IAED,sBAAsB;IACtB,MAAM,WAAW,GAAG,MAAM,QAAQ,CAChC,QAAQ,EACR,WAAW,EACX,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QACrB,OAAO,iBAAiB,CAAC,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAA;IAC3E,CAAC,EACD;QACE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAClD,OAAO,CAAC,KAAK,CAAC,IAAI,SAAS,GAAG,CAAC,IAAI,KAAK,aAAa,OAAO,CAAC,IAAI,KAAK,CAAC,CAAA;QACzE,CAAC,CAAC,CAAC,CAAC,SAAS;KACd,CACF,CAAA;IAED,iBAAiB;IACjB,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;IACjE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE;YAChD,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;gBACb,OAAO,KAAK,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAA;YACpD,CAAC;YACD,MAAM,CAAC,GAAG,EAAE,CAAC,MAAO,CAAA;YACpB,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAA;YAC1E,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,EAAE,MAAM,IAAI,CAAC,CAAC,CAAA;YAChH,MAAM,KAAK,GAAa,EAAE,CAAA;YAC1B,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;gBACtB,KAAK,CAAC,IAAI,CAAC,UAAU,aAAa,EAAE,CAAC,CAAA;YACvC,CAAC;YACD,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;gBACrB,KAAK,CAAC,IAAI,CAAC,SAAS,YAAY,EAAE,CAAC,CAAA;YACrC,CAAC;YACD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;YAClE,OAAO,KAAK,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,KAAK,EAAE,CAAC,QAAQ,KAAK,CAAA;QAC9D,CAAC,CAAC,CAAC,CAAA;IACL,CAAC;IAED,gCAAgC;IAChC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;AACH,CAAC"}