agent-messenger 2.10.1 → 2.11.0

package/src/platforms/discordbot/commands/snapshot.test.ts

@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, mock, test } from 'bun:test'
+import { afterEach, beforeEach, describe, expect, mock, it } from 'bun:test'
 import { existsSync, rmSync } from 'node:fs'
 import { mkdir } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -87,7 +87,7 @@ describe('snapshot command', () => {
   })
 
   describe('default (brief)', () => {
-    test('returns channels with id and name only', async () => {
+    it('returns channels with id and name only', async () => {
       const manager = await setupManager(tempDir)
 
       const result = await snapshotAction({ _credManager: manager })
@@ -99,7 +99,7 @@ describe('snapshot command', () => {
       expect(result.hint).toBeDefined()
     })
 
-    test('filters out non-text channels', async () => {
+    it('filters out non-text channels', async () => {
       const manager = await setupManager(tempDir)
 
       const result = await snapshotAction({ _credManager: manager })
@@ -108,7 +108,7 @@ describe('snapshot command', () => {
       expect(channelNames).not.toContain('voice')
     })
 
-    test('does not fetch messages', async () => {
+    it('does not fetch messages', async () => {
       const manager = await setupManager(tempDir)
 
       await snapshotAction({ _credManager: manager })
@@ -118,7 +118,7 @@ describe('snapshot command', () => {
   })
 
   describe('--full (channels + messages)', () => {
-    test('returns channels with recent messages', async () => {
+    it('returns channels with recent messages', async () => {
       const manager = await setupManager(tempDir)
 
       const result = await snapshotAction({ _credManager: manager, full: true })
@@ -136,7 +136,7 @@ describe('snapshot command', () => {
       })
     })
 
-    test('fetches messages in parallel for all text channels', async () => {
+    it('fetches messages in parallel for all text channels', async () => {
       const manager = await setupManager(tempDir)
 
       await snapshotAction({ _credManager: manager, full: true })
@@ -146,7 +146,7 @@ describe('snapshot command', () => {
       expect(mockGetMessages).toHaveBeenCalledWith('ch2', 5)
     })
 
-    test('respects --limit option', async () => {
+    it('respects --limit option', async () => {
       const manager = await setupManager(tempDir)
 
       await snapshotAction({ _credManager: manager, full: true, limit: 10 })
@@ -155,7 +155,7 @@ describe('snapshot command', () => {
       expect(mockGetMessages).toHaveBeenCalledWith('ch2', 10)
     })
 
-    test('defaults limit to 5', async () => {
+    it('defaults limit to 5', async () => {
       const manager = await setupManager(tempDir)
 
       await snapshotAction({ _credManager: manager, full: true })
@@ -165,7 +165,7 @@ describe('snapshot command', () => {
   })
 
   describe('--full --channels-only', () => {
-    test('returns only channel list without messages', async () => {
+    it('returns only channel list without messages', async () => {
       const manager = await setupManager(tempDir)
 
       const result = await snapshotAction({ _credManager: manager, full: true, channelsOnly: true })
@@ -179,7 +179,7 @@ describe('snapshot command', () => {
   })
 
   describe('--full --users-only', () => {
-    test('returns only user list', async () => {
+    it('returns only user list', async () => {
       const manager = await setupManager(tempDir)
 
       const result = await snapshotAction({ _credManager: manager, full: true, usersOnly: true })
@@ -195,7 +195,7 @@ describe('snapshot command', () => {
   })
 
   describe('--server option', () => {
-    test('uses explicit server ID', async () => {
+    it('uses explicit server ID', async () => {
       const manager = await setupManager(tempDir)
 
       const result = await snapshotAction({ _credManager: manager, server: 'other-guild' })
@@ -206,7 +206,7 @@ describe('snapshot command', () => {
   })
 
   describe('error handling', () => {
-    test('returns error when no server set', async () => {
+    it('returns error when no server set', async () => {
       const manager = new DiscordBotCredentialManager(tempDir)
       await manager.setCredentials({
         token: 'token123',
@@ -219,7 +219,7 @@ describe('snapshot command', () => {
       expect(result.error).toBeDefined()
     })
 
-    test('returns error on API failure', async () => {
+    it('returns error on API failure', async () => {
       mockListChannels.mockImplementationOnce(() => Promise.reject(new Error('API Error')))
       const manager = await setupManager(tempDir)
 

package/src/platforms/discordbot/commands/thread.test.ts

@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, mock, test } from 'bun:test'
+import { afterEach, beforeEach, describe, expect, mock, it } from 'bun:test'
 import { existsSync, rmSync } from 'node:fs'
 import { mkdir } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -75,7 +75,7 @@ describe('thread commands', () => {
   })
 
   describe('createAction', () => {
-    test('creates thread successfully', async () => {
+    it('creates thread successfully', async () => {
       const result = await createAction('general', 'test-thread', { _credManager: manager })
 
       expect(result.success).toBe(true)
@@ -87,7 +87,7 @@ describe('thread commands', () => {
       }
     })
 
-    test('includes auto_archive_duration when provided', async () => {
+    it('includes auto_archive_duration when provided', async () => {
       const result = await createAction('general', 'test-thread', {
         _credManager: manager,
         autoArchiveDuration: '60',
@@ -98,19 +98,19 @@ describe('thread commands', () => {
       expect(mockCreateThread).toHaveBeenCalledWith('channel-456', 'test-thread', { auto_archive_duration: 60 })
     })
 
-    test('resolves channel name', async () => {
+    it('resolves channel name', async () => {
       await createAction('general', 'test-thread', { _credManager: manager })
 
       expect(mockResolveChannel).toHaveBeenCalledWith('guild1', 'general')
     })
 
-    test('returns error when channel resolution fails', async () => {
+    it('returns error when channel resolution fails', async () => {
       const result = await createAction('nonexistent', 'test-thread', { _credManager: manager })
 
       expect(result.error).toContain('Channel not found')
     })
 
-    test('returns error when thread creation fails', async () => {
+    it('returns error when thread creation fails', async () => {
       mockCreateThread.mockImplementationOnce(() => Promise.reject(new Error('API Error')))
 
       const result = await createAction('general', 'test-thread', { _credManager: manager })
@@ -120,7 +120,7 @@ describe('thread commands', () => {
   })
 
   describe('archiveAction', () => {
-    test('archives thread successfully', async () => {
+    it('archives thread successfully', async () => {
       const result = await archiveAction('thread-789', { _credManager: manager })
 
       expect(result.success).toBe(true)
@@ -128,7 +128,7 @@ describe('thread commands', () => {
       expect(mockArchiveThread).toHaveBeenCalledWith('thread-789')
     })
 
-    test('returns error when archive fails', async () => {
+    it('returns error when archive fails', async () => {
       mockArchiveThread.mockImplementationOnce(() => Promise.reject(new Error('Forbidden')))
 
       const result = await archiveAction('thread-789', { _credManager: manager })
@@ -138,7 +138,7 @@ describe('thread commands', () => {
   })
 
   describe('action result structure', () => {
-    test('createAction returns success result with thread info', async () => {
+    it('createAction returns success result with thread info', async () => {
       const result = await createAction('general', 'test-thread', { _credManager: manager })
 
       if (!result.error) {
@@ -152,7 +152,7 @@ describe('thread commands', () => {
       }
     })
 
-    test('archiveAction returns success result with threadId', async () => {
+    it('archiveAction returns success result with threadId', async () => {
       const result = await archiveAction('thread-789', { _credManager: manager })
 
       if (!result.error) {

package/src/platforms/discordbot/commands/user.test.ts

@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, mock, test } from 'bun:test'
+import { afterEach, beforeEach, describe, expect, mock, it } from 'bun:test'
 import { existsSync, rmSync } from 'node:fs'
 import { mkdir } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -61,7 +61,7 @@ describe('user commands', () => {
   })
 
   describe('listAction', () => {
-    test('lists users from current server', async () => {
+    it('lists users from current server', async () => {
       const manager = new DiscordBotCredentialManager(tempDir)
       await manager.setCredentials({
         token: 'token123',
@@ -89,7 +89,7 @@ describe('user commands', () => {
       })
     })
 
-    test('includes bot users in list', async () => {
+    it('includes bot users in list', async () => {
       const manager = new DiscordBotCredentialManager(tempDir)
       await manager.setCredentials({
         token: 'token123',
@@ -105,7 +105,7 @@ describe('user commands', () => {
       expect(botUser?.username).toBe('mybot')
     })
 
-    test('returns error when no server set', async () => {
+    it('returns error when no server set', async () => {
       const manager = new DiscordBotCredentialManager(tempDir)
       await manager.setCredentials({
         token: 'token123',
@@ -119,7 +119,7 @@ describe('user commands', () => {
       expect(result.error).toContain('No server set')
     })
 
-    test('handles client errors', async () => {
+    it('handles client errors', async () => {
       mockListUsers.mockImplementationOnce(() => Promise.reject(new Error('API Error')))
 
       const manager = new DiscordBotCredentialManager(tempDir)
@@ -138,7 +138,7 @@ describe('user commands', () => {
   })
 
   describe('infoAction', () => {
-    test('returns user info by ID', async () => {
+    it('returns user info by ID', async () => {
       const manager = new DiscordBotCredentialManager(tempDir)
       await manager.setCredentials({
         token: 'token123',
@@ -155,7 +155,7 @@ describe('user commands', () => {
       expect(result.bot).toBe(false)
     })
 
-    test('returns bot user info', async () => {
+    it('returns bot user info', async () => {
       const manager = new DiscordBotCredentialManager(tempDir)
       await manager.setCredentials({
         token: 'token123',
@@ -170,7 +170,7 @@ describe('user commands', () => {
       expect(result.bot).toBe(true)
     })
 
-    test('returns error for nonexistent user', async () => {
+    it('returns error for nonexistent user', async () => {
       const manager = new DiscordBotCredentialManager(tempDir)
       await manager.setCredentials({
         token: 'token123',
@@ -184,7 +184,7 @@ describe('user commands', () => {
       expect(result.error).toContain('User not found')
     })
 
-    test('handles client errors', async () => {
+    it('handles client errors', async () => {
       mockGetUser.mockImplementationOnce(() => Promise.reject(new Error('API Error')))
 
       const manager = new DiscordBotCredentialManager(tempDir)

package/src/platforms/discordbot/commands/whoami.test.ts

@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, mock, test } from 'bun:test'
+import { afterEach, beforeEach, describe, expect, mock, it } from 'bun:test'
 import { existsSync, rmSync } from 'node:fs'
 import { mkdir } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -45,7 +45,7 @@ describe('whoami command', () => {
     process.env = originalEnv
   })
 
-  test('returns auth info for current bot', async () => {
+  it('returns auth info for current bot', async () => {
     const manager = new DiscordBotCredentialManager(tempDir)
     await manager.setCredentials({
       token: 'bot-token-123',
@@ -63,7 +63,7 @@ describe('whoami command', () => {
     expect(result.error).toBeUndefined()
   })
 
-  test('returns auth info for specific --bot', async () => {
+  it('returns auth info for specific --bot', async () => {
     const manager = new DiscordBotCredentialManager(tempDir)
     await manager.setCredentials({
       token: 'bot-token-123',
@@ -78,7 +78,7 @@ describe('whoami command', () => {
     expect(mockTestAuth).toHaveBeenCalledTimes(1)
   })
 
-  test('returns error when client throws', async () => {
+  it('returns error when client throws', async () => {
     mockTestAuth.mockImplementationOnce(() => Promise.reject(new Error('API Error')))
 
     const manager = new DiscordBotCredentialManager(tempDir)

package/src/platforms/discordbot/commands/whoami.ts

@@ -1,6 +1,6 @@
 import { Command } from 'commander'
 
-import { formatOutput } from '@/shared/utils/output'
+import { cliOutput } from '@/shared/utils/cli-output'
 
 import type { BotOption } from './shared'
 import { getClient } from './shared'
@@ -30,11 +30,6 @@ export async function whoamiAction(options: BotOption): Promise<WhoamiResult> {
   }
 }
 
-function cliOutput(result: WhoamiResult, pretty?: boolean): void {
-  console.log(formatOutput(result, pretty))
-  if (result.error) process.exit(1)
-}
-
 export const whoamiCommand = new Command('whoami')
   .description('Show current authenticated bot')
   .option('--bot <id>', 'Bot ID to use')

package/src/platforms/discordbot/credential-manager.test.ts

@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, test } from 'bun:test'
+import { afterEach, beforeEach, describe, expect, it } from 'bun:test'
 import { existsSync, rmSync } from 'node:fs'
 import { mkdir, stat } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -38,7 +38,7 @@ describe('DiscordBotCredentialManager', () => {
   })
 
   describe('load', () => {
-    test('returns empty config when no file exists', async () => {
+    it('returns empty config when no file exists', async () => {
       const config = await manager.load()
 
       expect(config.current).toBeNull()
@@ -49,7 +49,7 @@ describe('DiscordBotCredentialManager', () => {
   })
 
   describe('save and load', () => {
-    test('persists config to file', async () => {
+    it('persists config to file', async () => {
       const config = {
         current: { bot_id: 'bot-123' },
         bots: {
@@ -67,11 +67,11 @@ describe('DiscordBotCredentialManager', () => {
   })
 
   describe('getCredentials', () => {
-    test('returns null when no credentials exist', async () => {
+    it('returns null when no credentials exist', async () => {
       expect(await manager.getCredentials()).toBeNull()
     })
 
-    test('returns current bot credentials', async () => {
+    it('returns current bot credentials', async () => {
       await manager.setCredentials(CREDS_A)
 
       const creds = await manager.getCredentials()
@@ -79,7 +79,7 @@ describe('DiscordBotCredentialManager', () => {
       expect(creds).toEqual(CREDS_A)
     })
 
-    test('returns specific bot by id', async () => {
+    it('returns specific bot by id', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_B)
 
@@ -88,7 +88,7 @@ describe('DiscordBotCredentialManager', () => {
       expect(creds).toEqual(CREDS_A)
     })
 
-    test('returns null for non-existent bot id', async () => {
+    it('returns null for non-existent bot id', async () => {
       await manager.setCredentials(CREDS_A)
 
       const creds = await manager.getCredentials('nonexistent')
@@ -96,7 +96,7 @@ describe('DiscordBotCredentialManager', () => {
       expect(creds).toBeNull()
     })
 
-    test('env vars take precedence when no botId specified', async () => {
+    it('env vars take precedence when no botId specified', async () => {
       await manager.setCredentials(CREDS_A)
 
       process.env.E2E_DISCORDBOT_TOKEN = 'env-token'
@@ -112,7 +112,7 @@ describe('DiscordBotCredentialManager', () => {
       expect(creds?.server_name).toBe('Env Server')
     })
 
-    test('env vars ignored when botId explicitly provided', async () => {
+    it('env vars ignored when botId explicitly provided', async () => {
       await manager.setCredentials(CREDS_A)
 
       process.env.E2E_DISCORDBOT_TOKEN = 'env-token'
@@ -124,7 +124,7 @@ describe('DiscordBotCredentialManager', () => {
       expect(creds?.bot_id).toBe('bot-123')
     })
 
-    test('env vars use default server name when not provided', async () => {
+    it('env vars use default server name when not provided', async () => {
       process.env.E2E_DISCORDBOT_TOKEN = 'env-token'
       process.env.E2E_DISCORDBOT_SERVER_ID = 'server-789'
       delete process.env.E2E_DISCORDBOT_SERVER_NAME
@@ -136,7 +136,7 @@ describe('DiscordBotCredentialManager', () => {
   })
 
   describe('setCredentials', () => {
-    test('stores bot and sets as current', async () => {
+    it('stores bot and sets as current', async () => {
       await manager.setCredentials(CREDS_A)
 
       const config = await manager.load()
@@ -144,7 +144,7 @@ describe('DiscordBotCredentialManager', () => {
       expect(config.bots['bot-123'].token).toBe('bot-token-a')
     })
 
-    test('stores multiple bots', async () => {
+    it('stores multiple bots', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_B)
 
@@ -153,7 +153,7 @@ describe('DiscordBotCredentialManager', () => {
       expect(config.current).toEqual({ bot_id: 'bot-456' })
     })
 
-    test('overwrites existing bot with same id', async () => {
+    it('overwrites existing bot with same id', async () => {
       await manager.setCredentials(CREDS_A)
       const updated = { ...CREDS_A, bot_name: 'Updated Bot A' }
       await manager.setCredentials(updated)
@@ -165,7 +165,7 @@ describe('DiscordBotCredentialManager', () => {
   })
 
   describe('listAll', () => {
-    test('returns all bots with current flag', async () => {
+    it('returns all bots with current flag', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_B)
 
@@ -176,7 +176,7 @@ describe('DiscordBotCredentialManager', () => {
       expect(all.find((b) => b.bot_id === 'bot-456')?.is_current).toBe(true)
     })
 
-    test('returns empty array when no bots exist', async () => {
+    it('returns empty array when no bots exist', async () => {
       const all = await manager.listAll()
 
       expect(all).toEqual([])
@@ -184,7 +184,7 @@ describe('DiscordBotCredentialManager', () => {
   })
 
   describe('setCurrent', () => {
-    test('switches current bot', async () => {
+    it('switches current bot', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_B)
 
@@ -195,13 +195,13 @@ describe('DiscordBotCredentialManager', () => {
       expect(creds?.bot_id).toBe('bot-123')
     })
 
-    test('returns false for unknown bot', async () => {
+    it('returns false for unknown bot', async () => {
       expect(await manager.setCurrent('nonexistent')).toBe(false)
     })
   })
 
   describe('removeBot', () => {
-    test('removes a bot by id', async () => {
+    it('removes a bot by id', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_B)
 
@@ -212,7 +212,7 @@ describe('DiscordBotCredentialManager', () => {
       expect(Object.keys(config.bots)).toEqual(['bot-456'])
     })
 
-    test('clears current when current bot removed', async () => {
+    it('clears current when current bot removed', async () => {
       await manager.setCredentials(CREDS_A)
 
       await manager.removeBot('bot-123')
@@ -221,11 +221,11 @@ describe('DiscordBotCredentialManager', () => {
       expect(config.current).toBeNull()
     })
 
-    test('returns false for unknown bot', async () => {
+    it('returns false for unknown bot', async () => {
       expect(await manager.removeBot('nonexistent')).toBe(false)
     })
 
-    test('does not clear current if removing non-current bot', async () => {
+    it('does not clear current if removing non-current bot', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_B)
 
@@ -237,7 +237,7 @@ describe('DiscordBotCredentialManager', () => {
   })
 
   describe('clearCredentials', () => {
-    test('removes all credentials', async () => {
+    it('removes all credentials', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_B)
 
@@ -252,13 +252,13 @@ describe('DiscordBotCredentialManager', () => {
   })
 
   describe('getCurrentServer', () => {
-    test('returns null when no server set', async () => {
+    it('returns null when no server set', async () => {
       const serverId = await manager.getCurrentServer()
 
       expect(serverId).toBeNull()
     })
 
-    test('returns current server id', async () => {
+    it('returns current server id', async () => {
       await manager.setCurrentServer('guild-123', 'My Server')
 
       const serverId = await manager.getCurrentServer()
@@ -268,7 +268,7 @@ describe('DiscordBotCredentialManager', () => {
   })
 
   describe('setCurrentServer', () => {
-    test('sets current server and adds to servers map', async () => {
+    it('sets current server and adds to servers map', async () => {
       await manager.setCurrentServer('guild-123', 'My Server')
 
       const config = await manager.load()
@@ -279,7 +279,7 @@ describe('DiscordBotCredentialManager', () => {
       })
     })
 
-    test('updates existing server entry', async () => {
+    it('updates existing server entry', async () => {
       await manager.setCurrentServer('guild-123', 'My Server')
       await manager.setCurrentServer('guild-123', 'Updated Server')
 
@@ -287,7 +287,7 @@ describe('DiscordBotCredentialManager', () => {
       expect(config.servers['guild-123'].server_name).toBe('Updated Server')
     })
 
-    test('switches current server', async () => {
+    it('switches current server', async () => {
       await manager.setCurrentServer('guild-123', 'Server A')
       await manager.setCurrentServer('guild-456', 'Server B')
 
@@ -298,7 +298,7 @@ describe('DiscordBotCredentialManager', () => {
   })
 
   describe('file permissions', () => {
-    test('saves file with secure permissions (600)', async () => {
+    it('saves file with secure permissions (600)', async () => {
       await manager.setCredentials(CREDS_A)
 
       const credPath = join(tempDir, 'discordbot-credentials.json')

package/src/platforms/discordbot/index.test.ts

@@ -0,0 +1,82 @@
+import { expect, it } from 'bun:test'
+
+import {
+  DiscordBotClient,
+  DiscordBotConfigSchema,
+  DiscordBotCredentialManager,
+  DiscordBotCredentialsSchema,
+  DiscordBotEntrySchema,
+  DiscordBotError,
+  DiscordBotListener,
+  DiscordChannelSchema,
+  DiscordFileSchema,
+  DiscordGatewayOpcode,
+  DiscordGuildSchema,
+  DiscordIntent,
+  DiscordMessageSchema,
+  DiscordReactionSchema,
+  DiscordUserSchema,
+} from '@/platforms/discordbot/index'
+
+it('DiscordBotClient is exported from barrel', () => {
+  expect(typeof DiscordBotClient).toBe('function')
+})
+
+it('DiscordBotError is exported from barrel', () => {
+  expect(typeof DiscordBotError).toBe('function')
+})
+
+it('DiscordBotCredentialManager is exported from barrel', () => {
+  expect(typeof DiscordBotCredentialManager).toBe('function')
+})
+
+it('DiscordBotListener is exported from barrel', () => {
+  expect(typeof DiscordBotListener).toBe('function')
+})
+
+it('DiscordGatewayOpcode is exported from barrel', () => {
+  expect(DiscordGatewayOpcode.Identify).toBe(2)
+  expect(DiscordGatewayOpcode.Hello).toBe(10)
+})
+
+it('DiscordIntent is exported from barrel', () => {
+  expect(DiscordIntent.Guilds).toBe(1)
+  expect(DiscordIntent.GuildMessages).toBe(1 << 9)
+  expect(DiscordIntent.MessageContent).toBe(1 << 15)
+})
+
+it('DiscordBotEntrySchema is exported from barrel', () => {
+  expect(typeof DiscordBotEntrySchema.parse).toBe('function')
+})
+
+it('DiscordBotConfigSchema is exported from barrel', () => {
+  expect(typeof DiscordBotConfigSchema.parse).toBe('function')
+})
+
+it('DiscordBotCredentialsSchema is exported from barrel', () => {
+  expect(typeof DiscordBotCredentialsSchema.parse).toBe('function')
+})
+
+it('DiscordGuildSchema is exported from barrel', () => {
+  expect(typeof DiscordGuildSchema.parse).toBe('function')
+})
+
+it('DiscordChannelSchema is exported from barrel', () => {
+  expect(typeof DiscordChannelSchema.parse).toBe('function')
+})
+
+it('DiscordMessageSchema is exported from barrel', () => {
+  expect(typeof DiscordMessageSchema.parse).toBe('function')
+})
+
+it('DiscordUserSchema is exported from barrel', () => {
+  expect(typeof DiscordUserSchema.parse).toBe('function')
+})
+
+it('DiscordReactionSchema is exported from barrel', () => {
+  expect(typeof DiscordReactionSchema.parse).toBe('function')
+})
+
+it('DiscordFileSchema is exported from barrel', () => {
+  expect(typeof DiscordFileSchema.parse).toBe('function')
+})