coding-config 1.0.0

package/dist/utils/git.js

@@ -0,0 +1,259 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createTempDir = createTempDir;
+exports.cleanupTempDir = cleanupTempDir;
+exports.cloneRepo = cloneRepo;
+exports.pullRepo = pullRepo;
+exports.checkTeamExists = checkTeamExists;
+exports.listTeams = listTeams;
+exports.isGithubRepo = isGithubRepo;
+exports.isGerritRepo = isGerritRepo;
+exports.createBranch = createBranch;
+exports.generateChangeId = generateChangeId;
+exports.commitChanges = commitChanges;
+exports.pushToRemote = pushToRemote;
+exports.pushForReview = pushForReview;
+exports.parseGithubRepo = parseGithubRepo;
+exports.createPullRequest = createPullRequest;
+exports.createTeamDirectory = createTeamDirectory;
+const simple_git_1 = __importDefault(require("simple-git"));
+const fs = __importStar(require("fs-extra"));
+const path = __importStar(require("path"));
+const os = __importStar(require("os"));
+const crypto = __importStar(require("crypto"));
+const rest_1 = require("@octokit/rest");
+const constants_1 = require("../constants");
+/**
+ * 创建临时目录
+ */
+function createTempDir() {
+    const tempBase = os.tmpdir();
+    const randomSuffix = Math.random().toString(36).substring(7);
+    const tempDir = path.join(tempBase, `coding-config-${randomSuffix}`);
+    fs.ensureDirSync(tempDir);
+    return tempDir;
+}
+/**
+ * 清理临时目录
+ */
+async function cleanupTempDir(tempDir) {
+    if (await fs.pathExists(tempDir)) {
+        await fs.remove(tempDir);
+    }
+}
+/**
+ * 判断是否为本地路径
+ */
+function isLocalPath(repoUrl) {
+    return path.isAbsolute(repoUrl) || repoUrl.startsWith('./') || repoUrl.startsWith('../');
+}
+/**
+ * 克隆仓库到指定目录
+ * 如果是本地路径，直接复制文件；否则使用 git clone
+ */
+async function cloneRepo(repoUrl, localPath) {
+    await fs.ensureDir(path.dirname(localPath));
+    // 判断是否为本地路径
+    if (isLocalPath(repoUrl)) {
+        // 本地路径：直接复制文件
+        if (!(await fs.pathExists(repoUrl))) {
+            throw new Error(`本地路径不存在: ${repoUrl}`);
+        }
+        await fs.copy(repoUrl, localPath, {
+            filter: (src) => {
+                // 过滤掉 .git 目录和 node_modules
+                return !src.includes('/.git') && !src.includes('/node_modules');
+            }
+        });
+        return (0, simple_git_1.default)(localPath);
+    }
+    else {
+        // 远程仓库：使用 git clone
+        const git = (0, simple_git_1.default)();
+        await git.clone(repoUrl, localPath);
+        return (0, simple_git_1.default)(localPath);
+    }
+}
+/**
+ * 拉取最新代码
+ */
+async function pullRepo(localPath, branch = constants_1.DEFAULT_BRANCH) {
+    const git = (0, simple_git_1.default)(localPath);
+    await git.pull('origin', branch);
+}
+/**
+ * 检查团队目录是否存在
+ */
+async function checkTeamExists(repoPath, teamName) {
+    const teamPath = path.join(repoPath, teamName);
+    return await fs.pathExists(teamPath);
+}
+/**
+ * 获取所有团队列表
+ */
+async function listTeams(repoPath) {
+    const entries = await fs.readdir(repoPath, { withFileTypes: true });
+    return entries
+        .filter((entry) => entry.isDirectory() && !entry.name.startsWith('.'))
+        .map((entry) => entry.name);
+}
+/**
+ * 判断是否为 GitHub 仓库
+ */
+function isGithubRepo(repoUrl) {
+    return repoUrl.includes('github.com');
+}
+/**
+ * 判断是否为 Gerrit/iCode 仓库
+ */
+function isGerritRepo(repoUrl) {
+    // 只识别明确的 Gerrit 平台标识
+    return repoUrl.includes('icode.baidu.com') ||
+        repoUrl.includes('gerrit');
+}
+/**
+ * 创建新分支并切换
+ */
+async function createBranch(localPath, branchName) {
+    const git = (0, simple_git_1.default)(localPath);
+    await git.checkoutLocalBranch(branchName);
+}
+/**
+ * 生成 Gerrit Change-Id
+ * Change-Id 格式: I + 40位十六进制字符
+ */
+function generateChangeId() {
+    const timestamp = Date.now().toString();
+    const random = Math.random().toString();
+    const hash = crypto
+        .createHash('sha1')
+        .update(timestamp + random)
+        .digest('hex');
+    return `I${hash}`;
+}
+/**
+ * 提交变更
+ * 如果是 Gerrit 仓库，会自动添加 Change-Id 和 CardID
+ */
+async function commitChanges(localPath, message, repoUrl, cardId) {
+    const git = (0, simple_git_1.default)(localPath);
+    // 判断是否为 Gerrit 仓库
+    let finalMessage = message;
+    if (repoUrl && isGerritRepo(repoUrl)) {
+        // 添加 CardID（如果有）
+        if (cardId) {
+            // CardID 格式：icode-5481 提交信息
+            if (!message.startsWith(cardId)) {
+                finalMessage = `${cardId} ${message}`;
+            }
+        }
+        // 添加 Change-Id（如果没有）
+        if (!finalMessage.includes('Change-Id:')) {
+            const changeId = generateChangeId();
+            finalMessage = `${finalMessage}\n\nChange-Id: ${changeId}`;
+        }
+    }
+    await git.add('.');
+    await git.commit(finalMessage);
+}
+/**
+ * 推送到远程
+ */
+async function pushToRemote(localPath, branchName) {
+    const git = (0, simple_git_1.default)(localPath);
+    await git.push('origin', branchName, ['--set-upstream']);
+}
+/**
+ * 推送到远程用于 Code Review (Gerrit 风格)
+ * 使用 refs/for/<branch> 格式发起 CR
+ */
+async function pushForReview(localPath, targetBranch = constants_1.DEFAULT_BRANCH) {
+    const git = (0, simple_git_1.default)(localPath);
+    // 推送当前分支到 refs/for/目标分支 以发起 Code Review
+    await git.push('origin', `HEAD:refs/for/${targetBranch}`);
+}
+/**
+ * 解析 GitHub 仓库信息
+ */
+function parseGithubRepo(repoUrl) {
+    const match = repoUrl.match(/github\.com[:/]([^/]+)\/([^/.]+)(\.git)?$/);
+    if (!match) {
+        return null;
+    }
+    return {
+        owner: match[1],
+        repo: match[2],
+    };
+}
+/**
+ * 创建 Pull Request
+ */
+async function createPullRequest(repoUrl, branchName, title, body, token) {
+    const repoInfo = parseGithubRepo(repoUrl);
+    if (!repoInfo) {
+        throw new Error('无法解析 GitHub 仓库信息');
+    }
+    const octokit = new rest_1.Octokit({ auth: token });
+    const { data } = await octokit.pulls.create({
+        owner: repoInfo.owner,
+        repo: repoInfo.repo,
+        title,
+        head: branchName,
+        base: constants_1.DEFAULT_BRANCH,
+        body,
+    });
+    return data.html_url;
+}
+/**
+ * 创建团队目录结构
+ */
+async function createTeamDirectory(repoPath, teamName) {
+    const teamPath = path.join(repoPath, teamName);
+    // 创建团队根目录
+    await fs.ensureDir(teamPath);
+    // 创建子目录 (commands, hooks, skills, agents)
+    for (const dir of constants_1.CONFIG_DIRS) {
+        const dirPath = path.join(teamPath, dir);
+        await fs.ensureDir(dirPath);
+        // 创建 .gitkeep 文件以确保空目录也能被 git 追踪
+        const gitkeepPath = path.join(dirPath, '.gitkeep');
+        await fs.writeFile(gitkeepPath, '', 'utf-8');
+    }
+}
+//# sourceMappingURL=git.js.map

package/dist/utils/git.js.map

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

package/dist/utils/merge.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 合并结果
+ */
+interface MergeResult {
+    merged: boolean;
+    content?: string;
+    conflictRanges?: Array<{
+        start: number;
+        end: number;
+    }>;
+}
+/**
+ * 交互式合并文件
+ * @param localPath 本地文件路径
+ * @param remotePath 远程文件路径
+ * @param fileName 文件名（用于显示）
+ * @returns 合并结果
+ */
+export declare function interactiveMerge(localPath: string, remotePath: string, fileName: string): Promise<MergeResult>;
+export {};
+//# sourceMappingURL=merge.d.ts.map

package/dist/utils/merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/utils/merge.ts"],"names":[],"mappings":"AAaA;;GAEG;AACH,UAAU,WAAW;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxD;AA4ED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAmMtB"}

package/dist/utils/merge.js

@@ -0,0 +1,273 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.interactiveMerge = interactiveMerge;
+const fs = __importStar(require("fs-extra"));
+const inquirer_1 = __importDefault(require("inquirer"));
+const chalk_1 = __importDefault(require("chalk"));
+/**
+ * 识别文件中的冲突块
+ * 使用简单的逐行比较算法
+ */
+function identifyConflicts(localLines, remoteLines) {
+    const conflicts = [];
+    let i = 0;
+    let j = 0;
+    while (i < localLines.length || j < remoteLines.length) {
+        // 如果两行相同，继续
+        if (i < localLines.length && j < remoteLines.length && localLines[i] === remoteLines[j]) {
+            i++;
+            j++;
+            continue;
+        }
+        // 找到不同的地方，开始寻找冲突块
+        const conflictStart = i;
+        const localConflict = [];
+        const remoteConflict = [];
+        // 收集本地的不同行，直到找到与远程相同的行
+        let foundMatch = false;
+        let tempI = i;
+        let tempJ = j;
+        // 简单策略：向前查看最多10行，寻找匹配点
+        const lookAhead = 10;
+        for (let k = 0; k < lookAhead && tempI < localLines.length; k++, tempI++) {
+            localConflict.push(localLines[tempI]);
+            // 检查是否能在远程找到匹配
+            for (let l = 0; l < lookAhead && tempJ + l < remoteLines.length; l++) {
+                if (localLines[tempI] === remoteLines[tempJ + l]) {
+                    // 找到匹配点
+                    remoteConflict.push(...remoteLines.slice(j, tempJ + l));
+                    foundMatch = true;
+                    i = tempI + 1;
+                    j = tempJ + l + 1;
+                    break;
+                }
+            }
+            if (foundMatch)
+                break;
+        }
+        // 如果没找到匹配，将剩余的远程行也加入冲突
+        if (!foundMatch) {
+            while (j < remoteLines.length && remoteConflict.length < lookAhead) {
+                remoteConflict.push(remoteLines[j]);
+                j++;
+            }
+            i = tempI;
+        }
+        if (localConflict.length > 0 || remoteConflict.length > 0) {
+            conflicts.push({
+                startLine: conflictStart + 1,
+                localLines: localConflict,
+                remoteLines: remoteConflict,
+            });
+        }
+        // 如果到达末尾，退出
+        if (!foundMatch && i >= localLines.length && j >= remoteLines.length) {
+            break;
+        }
+    }
+    return conflicts;
+}
+/**
+ * 交互式合并文件
+ * @param localPath 本地文件路径
+ * @param remotePath 远程文件路径
+ * @param fileName 文件名（用于显示）
+ * @returns 合并结果
+ */
+async function interactiveMerge(localPath, remotePath, fileName) {
+    const [localContent, remoteContent] = await Promise.all([
+        fs.readFile(localPath, 'utf-8'),
+        fs.readFile(remotePath, 'utf-8'),
+    ]);
+    const localLines = localContent.split('\n');
+    const remoteLines = remoteContent.split('\n');
+    // 识别冲突块
+    const conflicts = identifyConflicts(localLines, remoteLines);
+    if (conflicts.length === 0) {
+        console.log(chalk_1.default.green('✓ 文件没有冲突'));
+        return { merged: true, content: localContent };
+    }
+    console.log(chalk_1.default.cyan(`\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━`));
+    console.log(chalk_1.default.cyan(`  交互式合并: ${fileName}`));
+    console.log(chalk_1.default.cyan(`  发现 ${conflicts.length} 个冲突块`));
+    console.log(chalk_1.default.cyan(`━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n`));
+    // 构建合并结果
+    const mergedLines = [];
+    const conflictRanges = [];
+    let lastProcessedLine = 0;
+    for (let idx = 0; idx < conflicts.length; idx++) {
+        const conflict = conflicts[idx];
+        // 添加冲突之前的相同内容
+        for (let i = lastProcessedLine; i < conflict.startLine - 1; i++) {
+            if (i < localLines.length) {
+                mergedLines.push(localLines[i]);
+            }
+        }
+        // 记录冲突开始位置
+        const conflictStartLine = mergedLines.length + 1;
+        // 显示冲突
+        console.log(chalk_1.default.yellow(`\n冲突 ${idx + 1}/${conflicts.length} (第 ${conflict.startLine} 行附近):\n`));
+        console.log(chalk_1.default.green('本地版本:'));
+        console.log(chalk_1.default.green('─'.repeat(60)));
+        conflict.localLines.forEach((line, i) => {
+            console.log(chalk_1.default.green(`  ${String(i + 1).padStart(2, ' ')} | ${line}`));
+        });
+        console.log(chalk_1.default.blue('\n远程版本:'));
+        console.log(chalk_1.default.blue('─'.repeat(60)));
+        conflict.remoteLines.forEach((line, i) => {
+            console.log(chalk_1.default.blue(`  ${String(i + 1).padStart(2, ' ')} | ${line}`));
+        });
+        // 让用户选择如何处理这个冲突（简化为三个选项）
+        const { resolution } = await inquirer_1.default.prompt([
+            {
+                type: 'list',
+                name: 'resolution',
+                message: '如何处理这个冲突？',
+                choices: [
+                    { name: '接受本地版本', value: 'local' },
+                    { name: '接受远程版本', value: 'remote' },
+                    { name: '手动编辑内容', value: 'edit' },
+                ],
+            },
+        ]);
+        if (resolution === 'local') {
+            mergedLines.push(...conflict.localLines);
+        }
+        else if (resolution === 'remote') {
+            mergedLines.push(...conflict.remoteLines);
+        }
+        else if (resolution === 'edit') {
+            // 手动编辑模式
+            console.log(chalk_1.default.cyan('\n请输入合并后的内容（每行一个，输入空行结束）:'));
+            const editedLines = [];
+            let lineNumber = 1;
+            while (true) {
+                const { line } = await inquirer_1.default.prompt([
+                    {
+                        type: 'input',
+                        name: 'line',
+                        message: `第 ${lineNumber} 行:`,
+                        default: lineNumber === 1 ? conflict.localLines[0] || conflict.remoteLines[0] : '',
+                    },
+                ]);
+                if (line === '' && editedLines.length > 0) {
+                    // 确认结束
+                    const { done } = await inquirer_1.default.prompt([
+                        {
+                            type: 'confirm',
+                            name: 'done',
+                            message: '完成编辑？',
+                            default: true,
+                        },
+                    ]);
+                    if (done)
+                        break;
+                }
+                if (line !== '' || editedLines.length > 0) {
+                    editedLines.push(line);
+                    lineNumber++;
+                }
+                if (lineNumber > 50) {
+                    console.log(chalk_1.default.yellow('提示: 行数过多，建议使用外部编辑器'));
+                    break;
+                }
+            }
+            mergedLines.push(...editedLines);
+        }
+        // 记录冲突结束位置
+        const conflictEndLine = mergedLines.length;
+        conflictRanges.push({ start: conflictStartLine, end: conflictEndLine });
+        lastProcessedLine = conflict.startLine + conflict.localLines.length - 1;
+    }
+    // 添加剩余的内容
+    for (let i = lastProcessedLine; i < localLines.length; i++) {
+        mergedLines.push(localLines[i]);
+    }
+    const mergedContent = mergedLines.join('\n');
+    // 显示合并结果预览（标记冲突位置并用虚线分隔）
+    console.log(chalk_1.default.cyan('\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
+    console.log(chalk_1.default.cyan('  合并结果预览:'));
+    console.log(chalk_1.default.cyan('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n'));
+    // 显示所有内容，但限制总行数
+    const maxDisplayLines = 30;
+    let displayedLines = 0;
+    for (let i = 0; i < mergedLines.length && displayedLines < maxDisplayLines; i++) {
+        const lineNum = i + 1;
+        const line = mergedLines[i];
+        // 检查是否在冲突范围内
+        const inConflict = conflictRanges.some(range => lineNum >= range.start && lineNum <= range.end);
+        // 检查是否是冲突边界
+        const isConflictStart = conflictRanges.some(range => lineNum === range.start);
+        const isConflictEnd = conflictRanges.some(range => lineNum === range.end);
+        if (isConflictStart) {
+            console.log(chalk_1.default.yellow('─'.repeat(60) + ' (冲突位置开始)'));
+        }
+        if (inConflict) {
+            console.log(chalk_1.default.yellow(`${String(lineNum).padStart(3, ' ')} | ${line}`));
+        }
+        else {
+            console.log(chalk_1.default.gray(`${String(lineNum).padStart(3, ' ')} | ${line}`));
+        }
+        if (isConflictEnd) {
+            console.log(chalk_1.default.yellow('─'.repeat(60) + ' (冲突位置结束)'));
+        }
+        displayedLines++;
+    }
+    if (mergedLines.length > maxDisplayLines) {
+        console.log(chalk_1.default.gray(`\n... (还有 ${mergedLines.length - maxDisplayLines} 行，共 ${mergedLines.length} 行)`));
+    }
+    else {
+        console.log(chalk_1.default.gray(`\n(共 ${mergedLines.length} 行)`));
+    }
+    // 确认保存
+    const { save } = await inquirer_1.default.prompt([
+        {
+            type: 'confirm',
+            name: 'save',
+            message: '保存合并结果？',
+            default: true,
+        },
+    ]);
+    if (!save) {
+        console.log(chalk_1.default.yellow('✗ 已取消合并'));
+        return { merged: false };
+    }
+    return { merged: true, content: mergedContent, conflictRanges };
+}
+//# sourceMappingURL=merge.js.map

package/dist/utils/merge.js.map

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

package/dist/utils/prompt.d.ts

@@ -0,0 +1,27 @@
+import { ConfigLevel, ConflictResolution } from '../types';
+/**
+ * 选择配置级别
+ */
+export declare function selectConfigLevel(): Promise<{
+    level: ConfigLevel;
+    path: string;
+}>;
+/**
+ * 选择冲突解决策略
+ * @param file 文件名
+ * @param showDiffCallback 可选的差异展示回调函数
+ */
+export declare function selectConflictResolution(file: string, showDiffCallback?: () => Promise<void>): Promise<ConflictResolution>;
+/**
+ * 确认操作
+ */
+export declare function confirm(message: string, defaultValue?: boolean): Promise<boolean>;
+/**
+ * 输入文本
+ */
+export declare function inputText(message: string, defaultValue?: string, validate?: (input: string) => boolean | string): Promise<string>;
+/**
+ * 输入密码（GitHub Token）
+ */
+export declare function inputPassword(message: string): Promise<string>;
+//# sourceMappingURL=prompt.d.ts.map

package/dist/utils/prompt.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/utils/prompt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAI3D;;GAEG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAuDvF;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,MAAM,EACZ,gBAAgB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACrC,OAAO,CAAC,kBAAkB,CAAC,CA8B7B;AAED;;GAEG;AACH,wBAAsB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAWrF;AAED;;GAEG;AACH,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,GAAG,MAAM,GAC7C,OAAO,CAAC,MAAM,CAAC,CAYjB;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAiBpE"}