@pikku/addon-console 0.12.6 → 0.12.7

package/dist/src/services/code-edit.service.test.js

@@ -0,0 +1,375 @@
+import { describe, test, beforeEach, afterEach } from 'node:test';
+import assert from 'node:assert';
+import { mkdtemp, writeFile, readFile, rm } from 'node:fs/promises';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { CodeEditService } from './code-edit.service.js';
+let tempDir;
+let service;
+async function createTempFile(name, content) {
+    const filePath = join(tempDir, name);
+    await writeFile(filePath, content, 'utf-8');
+    return filePath;
+}
+async function readTempFile(name) {
+    return readFile(join(tempDir, name), 'utf-8');
+}
+const FUNCTION_SOURCE = `import { pikkuSessionlessFunc } from '@pikku/core'
+
+export const listTodos = pikkuSessionlessFunc<ListInput, ListOutput>({
+  title: 'List Todos',
+  description: 'Lists all todos for a user',
+  tags: ['todos', 'read'],
+  expose: true,
+  func: async ({ logger, todoStore }, { userId }) => {
+    const todos = await todoStore.list(userId)
+    return { todos }
+  },
+})
+`;
+const FUNCTION_NO_TRAILING_COMMA = `import { pikkuFunc } from '@pikku/core'
+
+export const createTodo = pikkuFunc({
+  description: 'Create a todo',
+  mcp: true,
+  func: async ({ todoStore }, data) => {
+    return await todoStore.create(data)
+  }
+})
+`;
+const AGENT_SOURCE = `import { pikkuAIAgent } from '@pikku/core'
+
+export const todoAssistant = pikkuAIAgent({
+  name: 'todo-assistant',
+  description: 'A helpful assistant that manages todos',
+  role: 'You are a todo management specialist.',
+  personality: 'Be concise and helpful.',
+  goal: 'Help users manage their todo lists.',
+  model: 'openai/gpt-4o-mini',
+  maxSteps: 5,
+  toolChoice: 'auto',
+  tools: [listTodos, createTodo],
+})
+`;
+const MULTI_FUNCTION_SOURCE = `import { pikkuSessionlessFunc } from '@pikku/core'
+
+export const funcA = pikkuSessionlessFunc({
+  description: 'Function A',
+  func: async () => 'a',
+})
+
+export const funcB = pikkuSessionlessFunc({
+  description: 'Function B',
+  expose: true,
+  func: async () => 'b',
+})
+`;
+describe('CodeEditService', () => {
+    beforeEach(async () => {
+        tempDir = await mkdtemp(join(tmpdir(), 'pikku-code-edit-'));
+        service = new CodeEditService(tempDir);
+    });
+    afterEach(async () => {
+        await rm(tempDir, { recursive: true, force: true });
+    });
+    describe('readFunctionSource', () => {
+        test('reads config properties and function body', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            const result = await service.readFunctionSource(join(tempDir, 'funcs.ts'), 'listTodos');
+            assert.strictEqual(result.wrapperName, 'pikkuSessionlessFunc');
+            assert.strictEqual(result.config.title, 'List Todos');
+            assert.strictEqual(result.config.description, 'Lists all todos for a user');
+            assert.deepStrictEqual(result.config.tags, ['todos', 'read']);
+            assert.strictEqual(result.config.expose, true);
+            assert.ok(result.body);
+            assert.ok(result.body.includes('todoStore.list(userId)'));
+        });
+        test('excludes func property from config', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            const result = await service.readFunctionSource(join(tempDir, 'funcs.ts'), 'listTodos');
+            assert.strictEqual(result.config.func, undefined);
+        });
+        test('returns null body when no func property exists', async () => {
+            const source = `export const myConfig = pikkuSessionlessFunc({
+  description: 'No func here',
+  expose: true,
+})`;
+            await createTempFile('no-func.ts', source);
+            const result = await service.readFunctionSource(join(tempDir, 'no-func.ts'), 'myConfig');
+            assert.strictEqual(result.body, null);
+        });
+        test('throws for non-existent exported name', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            await assert.rejects(() => service.readFunctionSource(join(tempDir, 'funcs.ts'), 'nonExistent'), /Could not find exported variable 'nonExistent'/);
+        });
+        test('finds correct function in multi-function file', async () => {
+            await createTempFile('multi.ts', MULTI_FUNCTION_SOURCE);
+            const resultA = await service.readFunctionSource(join(tempDir, 'multi.ts'), 'funcA');
+            assert.strictEqual(resultA.config.description, 'Function A');
+            assert.strictEqual(resultA.config.expose, undefined);
+            const resultB = await service.readFunctionSource(join(tempDir, 'multi.ts'), 'funcB');
+            assert.strictEqual(resultB.config.description, 'Function B');
+            assert.strictEqual(resultB.config.expose, true);
+        });
+        test('parses numeric values correctly', async () => {
+            const source = `export const myFunc = pikkuSessionlessFunc({
+  maxSteps: 10,
+  temperature: 0.7,
+  func: async () => {},
+})`;
+            await createTempFile('nums.ts', source);
+            const result = await service.readFunctionSource(join(tempDir, 'nums.ts'), 'myFunc');
+            assert.strictEqual(result.config.maxSteps, 10);
+            assert.strictEqual(result.config.temperature, 0.7);
+        });
+    });
+    describe('readFunctionBody', () => {
+        test('returns the function body', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            const body = await service.readFunctionBody(join(tempDir, 'funcs.ts'), 'listTodos');
+            assert.ok(body.includes('todoStore.list(userId)'));
+            assert.ok(body.includes('return { todos }'));
+        });
+        test('throws when no func property exists', async () => {
+            const source = `export const noFunc = pikkuSessionlessFunc({
+  description: 'No func',
+})`;
+            await createTempFile('no-func.ts', source);
+            await assert.rejects(() => service.readFunctionBody(join(tempDir, 'no-func.ts'), 'noFunc'), /No 'func' property found/);
+        });
+    });
+    describe('updateFunctionConfig', () => {
+        test('updates an existing string property', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            await service.updateFunctionConfig(join(tempDir, 'funcs.ts'), 'listTodos', { description: 'Updated description' });
+            const updated = await readTempFile('funcs.ts');
+            assert.ok(updated.includes("'Updated description'"));
+            assert.ok(!updated.includes('Lists all todos for a user'));
+        });
+        test('updates a boolean property', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            await service.updateFunctionConfig(join(tempDir, 'funcs.ts'), 'listTodos', { expose: false });
+            const updated = await readTempFile('funcs.ts');
+            assert.ok(updated.includes('expose: false'));
+            assert.ok(!updated.includes('expose: true'));
+        });
+        test('adds a new property', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            await service.updateFunctionConfig(join(tempDir, 'funcs.ts'), 'listTodos', { mcp: true });
+            const updated = await readTempFile('funcs.ts');
+            assert.ok(updated.includes('mcp: true'));
+        });
+        test('removes a property by setting null', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            await service.updateFunctionConfig(join(tempDir, 'funcs.ts'), 'listTodos', { tags: null });
+            const updated = await readTempFile('funcs.ts');
+            assert.ok(!updated.includes('tags:'));
+            // Other properties should still be there
+            assert.ok(updated.includes("title: 'List Todos'"));
+            assert.ok(updated.includes('expose: true'));
+        });
+        test('updates array property', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            await service.updateFunctionConfig(join(tempDir, 'funcs.ts'), 'listTodos', { tags: ['updated', 'tags'] });
+            const updated = await readTempFile('funcs.ts');
+            assert.ok(updated.includes("['updated', 'tags']"));
+        });
+        test('preserves function body when updating config', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            await service.updateFunctionConfig(join(tempDir, 'funcs.ts'), 'listTodos', { title: 'New Title' });
+            const updated = await readTempFile('funcs.ts');
+            assert.ok(updated.includes('todoStore.list(userId)'));
+            assert.ok(updated.includes('return { todos }'));
+        });
+        test('preserves import statements', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            await service.updateFunctionConfig(join(tempDir, 'funcs.ts'), 'listTodos', { description: 'Changed' });
+            const updated = await readTempFile('funcs.ts');
+            assert.ok(updated.includes("import { pikkuSessionlessFunc } from '@pikku/core'"));
+        });
+        test('handles multiple changes at once', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            await service.updateFunctionConfig(join(tempDir, 'funcs.ts'), 'listTodos', {
+                title: 'New Title',
+                description: null,
+                mcp: true,
+                expose: false,
+            });
+            const updated = await readTempFile('funcs.ts');
+            assert.ok(updated.includes("title: 'New Title'"));
+            assert.ok(!updated.includes('Lists all todos'));
+            assert.ok(updated.includes('mcp: true'));
+            assert.ok(updated.includes('expose: false'));
+        });
+        test('only modifies the target function in multi-function file', async () => {
+            await createTempFile('multi.ts', MULTI_FUNCTION_SOURCE);
+            await service.updateFunctionConfig(join(tempDir, 'multi.ts'), 'funcA', {
+                description: 'Updated A',
+            });
+            const updated = await readTempFile('multi.ts');
+            assert.ok(updated.includes("'Updated A'"));
+            assert.ok(updated.includes("'Function B'"));
+        });
+        test('result is valid TypeScript after update', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            await service.updateFunctionConfig(join(tempDir, 'funcs.ts'), 'listTodos', { title: 'New Title', summary: 'A summary' });
+            const updated = await readTempFile('funcs.ts');
+            // Verify we can re-read the updated file without errors
+            const result = await service.readFunctionSource(join(tempDir, 'funcs.ts'), 'listTodos');
+            assert.strictEqual(result.config.title, 'New Title');
+            assert.strictEqual(result.config.summary, 'A summary');
+        });
+    });
+    describe('updateFunctionBody', () => {
+        test('replaces the function body', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            const newBody = `async ({ logger }, { userId }) => {
+    logger.info('new impl')
+    return { todos: [] }
+  }`;
+            await service.updateFunctionBody(join(tempDir, 'funcs.ts'), 'listTodos', newBody);
+            const updated = await readTempFile('funcs.ts');
+            assert.ok(updated.includes("logger.info('new impl')"));
+            assert.ok(updated.includes('return { todos: [] }'));
+            assert.ok(!updated.includes('todoStore.list(userId)'));
+        });
+        test('preserves config properties when updating body', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            await service.updateFunctionBody(join(tempDir, 'funcs.ts'), 'listTodos', 'async () => ({ todos: [] })');
+            const updated = await readTempFile('funcs.ts');
+            assert.ok(updated.includes("title: 'List Todos'"));
+            assert.ok(updated.includes("description: 'Lists all todos for a user'"));
+            assert.ok(updated.includes('expose: true'));
+        });
+    });
+    describe('readAgentSource', () => {
+        test('reads all agent config properties', async () => {
+            await createTempFile('agent.ts', AGENT_SOURCE);
+            const result = await service.readAgentSource(join(tempDir, 'agent.ts'), 'todoAssistant');
+            assert.strictEqual(result.config.name, 'todo-assistant');
+            assert.strictEqual(result.config.description, 'A helpful assistant that manages todos');
+            assert.strictEqual(result.config.role, 'You are a todo management specialist.');
+            assert.strictEqual(result.config.personality, 'Be concise and helpful.');
+            assert.strictEqual(result.config.goal, 'Help users manage their todo lists.');
+            assert.strictEqual(result.config.model, 'openai/gpt-4o-mini');
+            assert.strictEqual(result.config.maxSteps, 5);
+            assert.strictEqual(result.config.toolChoice, 'auto');
+        });
+        test('returns raw text for non-literal values (function refs)', async () => {
+            await createTempFile('agent.ts', AGENT_SOURCE);
+            const result = await service.readAgentSource(join(tempDir, 'agent.ts'), 'todoAssistant');
+            // tools: [listTodos, createTodo] — these are identifier refs, not strings
+            assert.ok(result.config.tools !== undefined);
+        });
+    });
+    describe('updateAgentConfig', () => {
+        test('updates agent goal', async () => {
+            await createTempFile('agent.ts', AGENT_SOURCE);
+            await service.updateAgentConfig(join(tempDir, 'agent.ts'), 'todoAssistant', { goal: 'Manage complex project workflows.' });
+            const updated = await readTempFile('agent.ts');
+            assert.ok(updated.includes("'Manage complex project workflows.'"));
+            assert.ok(!updated.includes('Help users manage their todo lists.'));
+        });
+        test('updates agent model', async () => {
+            await createTempFile('agent.ts', AGENT_SOURCE);
+            await service.updateAgentConfig(join(tempDir, 'agent.ts'), 'todoAssistant', { model: 'anthropic/claude-sonnet-4-6' });
+            const updated = await readTempFile('agent.ts');
+            assert.ok(updated.includes("'anthropic/claude-sonnet-4-6'"));
+            assert.ok(!updated.includes('openai/gpt-4o-mini'));
+        });
+        test('updates agent maxSteps', async () => {
+            await createTempFile('agent.ts', AGENT_SOURCE);
+            await service.updateAgentConfig(join(tempDir, 'agent.ts'), 'todoAssistant', { maxSteps: 10 });
+            const updated = await readTempFile('agent.ts');
+            assert.ok(updated.includes('maxSteps: 10'));
+            assert.ok(!updated.includes('maxSteps: 5'));
+        });
+        test('removes agent toolChoice by setting null', async () => {
+            await createTempFile('agent.ts', AGENT_SOURCE);
+            await service.updateAgentConfig(join(tempDir, 'agent.ts'), 'todoAssistant', { toolChoice: null });
+            const updated = await readTempFile('agent.ts');
+            assert.ok(!updated.includes('toolChoice'));
+            // Other properties preserved
+            assert.ok(updated.includes("name: 'todo-assistant'"));
+            assert.ok(updated.includes('maxSteps: 5'));
+        });
+        test('handles multi-line goal', async () => {
+            await createTempFile('agent.ts', AGENT_SOURCE);
+            const newGoal = 'Manage todos.\nPrioritize by urgency.\nNever delete without asking.';
+            await service.updateAgentConfig(join(tempDir, 'agent.ts'), 'todoAssistant', { goal: newGoal });
+            const updated = await readTempFile('agent.ts');
+            assert.ok(updated.includes('`Manage todos.'));
+            assert.ok(updated.includes('Never delete without asking.`'));
+        });
+        test('preserves other agent properties on update', async () => {
+            await createTempFile('agent.ts', AGENT_SOURCE);
+            await service.updateAgentConfig(join(tempDir, 'agent.ts'), 'todoAssistant', { description: 'Updated description' });
+            const updated = await readTempFile('agent.ts');
+            assert.ok(updated.includes("name: 'todo-assistant'"));
+            assert.ok(updated.includes('maxSteps: 5'));
+            assert.ok(updated.includes('tools: [listTodos, createTodo]'));
+        });
+        test('roundtrip: update then read returns correct values', async () => {
+            await createTempFile('agent.ts', AGENT_SOURCE);
+            await service.updateAgentConfig(join(tempDir, 'agent.ts'), 'todoAssistant', {
+                role: 'You are a project manager.',
+                goal: 'Coordinate team tasks.',
+                model: 'anthropic/claude-sonnet-4-6',
+                maxSteps: 20,
+            });
+            const result = await service.readAgentSource(join(tempDir, 'agent.ts'), 'todoAssistant');
+            assert.strictEqual(result.config.role, 'You are a project manager.');
+            assert.strictEqual(result.config.goal, 'Coordinate team tasks.');
+            assert.strictEqual(result.config.model, 'anthropic/claude-sonnet-4-6');
+            assert.strictEqual(result.config.maxSteps, 20);
+            // Unchanged properties
+            assert.strictEqual(result.config.name, 'todo-assistant');
+        });
+    });
+    describe('resolvePath', () => {
+        test('absolute paths are used as-is', async () => {
+            const absPath = join(tempDir, 'abs.ts');
+            await writeFile(absPath, `export const x = pikkuSessionlessFunc({ description: 'test' })`, 'utf-8');
+            const result = await service.readFunctionSource(absPath, 'x');
+            assert.strictEqual(result.config.description, 'test');
+        });
+        test('relative paths resolve from rootDir', async () => {
+            await createTempFile('rel.ts', `export const x = pikkuSessionlessFunc({ description: 'relative' })`);
+            const result = await service.readFunctionSource('rel.ts', 'x');
+            assert.strictEqual(result.config.description, 'relative');
+        });
+    });
+    describe('edge cases', () => {
+        test('handles pikkuFunc wrapper (not sessionless)', async () => {
+            await createTempFile('funcs.ts', FUNCTION_NO_TRAILING_COMMA);
+            const result = await service.readFunctionSource(join(tempDir, 'funcs.ts'), 'createTodo');
+            assert.strictEqual(result.wrapperName, 'pikkuFunc');
+            assert.strictEqual(result.config.description, 'Create a todo');
+            assert.strictEqual(result.config.mcp, true);
+        });
+        test('handles function with no trailing comma on last property', async () => {
+            await createTempFile('funcs.ts', FUNCTION_NO_TRAILING_COMMA);
+            await service.updateFunctionConfig(join(tempDir, 'funcs.ts'), 'createTodo', { expose: true });
+            const updated = await readTempFile('funcs.ts');
+            assert.ok(updated.includes('expose: true'));
+            // Verify it's still parseable
+            const result = await service.readFunctionSource(join(tempDir, 'funcs.ts'), 'createTodo');
+            assert.strictEqual(result.config.expose, true);
+        });
+        test('handles strings with single quotes', async () => {
+            await createTempFile('quotes.ts', `export const x = pikkuSessionlessFunc({ description: 'test' })`);
+            await service.updateFunctionConfig(join(tempDir, 'quotes.ts'), 'x', {
+                description: "it's a test",
+            });
+            const updated = await readTempFile('quotes.ts');
+            assert.ok(updated.includes("it\\'s a test"));
+        });
+        test('handles empty tags array', async () => {
+            await createTempFile('funcs.ts', FUNCTION_SOURCE);
+            await service.updateFunctionConfig(join(tempDir, 'funcs.ts'), 'listTodos', { tags: [] });
+            const updated = await readTempFile('funcs.ts');
+            assert.ok(updated.includes('tags: []'));
+        });
+    });
+});
+//# sourceMappingURL=code-edit.service.test.js.map

package/dist/src/services/code-edit.service.test.js.map

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

package/dist/src/services/oauth.service.d.ts

@@ -4,6 +4,7 @@ export interface PendingOAuthFlow {
     oauth2: OAuth2CredentialConfig;
     secretId: string;
     callbackUrl: string;
+    userId?: string;
     createdAt: number;
 }
 export declare class OAuthService {

package/dist/src/services/oauth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.service.d.ts","sourceRoot":"","sources":["../../../src/services/oauth.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAEhE,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,sBAAsB,CAAA;IAC9B,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;CAClB;AAID,qBAAa,YAAY;IACvB,OAAO,CAAC,YAAY,CAAsC;IAE1D,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAK3D,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAK3D,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAItC,OAAO,CAAC,OAAO;CAQhB"}
+{"version":3,"file":"oauth.service.d.ts","sourceRoot":"","sources":["../../../src/services/oauth.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAEhE,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,sBAAsB,CAAA;IAC9B,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;CAClB;AAID,qBAAa,YAAY;IACvB,OAAO,CAAC,YAAY,CAAsC;IAE1D,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAK3D,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAK3D,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAItC,OAAO,CAAC,OAAO;CAQhB"}

package/dist/src/services/oauth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../../src/services/oauth.service.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAElC,MAAM,OAAO,YAAY;IAAzB;QACU,iBAAY,GAAG,IAAI,GAAG,EAA4B,CAAA;IAwB5D,CAAC;IAtBC,cAAc,CAAC,KAAa,EAAE,IAAsB;QAClD,IAAI,CAAC,OAAO,EAAE,CAAA;QACd,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IACpC,CAAC;IAED,cAAc,CAAC,KAAa;QAC1B,IAAI,CAAC,OAAO,EAAE,CAAA;QACd,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACrC,CAAC;IAED,iBAAiB,CAAC,KAAa;QAC7B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACjC,CAAC;IAEO,OAAO;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACtB,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC9C,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,GAAG,WAAW,EAAE,CAAC;gBACvC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../../src/services/oauth.service.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAElC,MAAM,OAAO,YAAY;IAAzB;QACU,iBAAY,GAAG,IAAI,GAAG,EAA4B,CAAA;IAwB5D,CAAC;IAtBC,cAAc,CAAC,KAAa,EAAE,IAAsB;QAClD,IAAI,CAAC,OAAO,EAAE,CAAA;QACd,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IACpC,CAAC;IAED,cAAc,CAAC,KAAa;QAC1B,IAAI,CAAC,OAAO,EAAE,CAAA;QACd,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACrC,CAAC;IAED,iBAAiB,CAAC,KAAa;QAC7B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACjC,CAAC;IAEO,OAAO;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACtB,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC9C,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,GAAG,WAAW,EAAE,CAAC;gBACvC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;IACH,CAAC;CACF"}