From aa1412b340f6231ef4f12c361745d07116195557 Mon Sep 17 00:00:00 2001 From: Takatoshi Matsumoto Date: Mon, 13 Jun 2022 21:46:33 +0900 Subject: [PATCH 1/2] breaking: simplify awsBulkSend interface --- packages/aws-bulk-send/__tests__/index.ts | 17 ++++------------- packages/aws-bulk-send/lib/index.ts | 8 ++++---- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/packages/aws-bulk-send/__tests__/index.ts b/packages/aws-bulk-send/__tests__/index.ts index 2254acd..8bc18a7 100644 --- a/packages/aws-bulk-send/__tests__/index.ts +++ b/packages/aws-bulk-send/__tests__/index.ts @@ -37,18 +37,9 @@ describe('awsBulkSend', () => { }) expect(res).toEqual([ - [ - { Bucket: 'B1', Key: 'K1' }, - { $metadata, Body: 'B1-K1' }, - ], - [ - { Bucket: 'B3', Key: 'K3' }, - { $metadata, Body: 'B3-K3' }, - ], - [ - { Bucket: 'B2', Key: 'K2' }, - { $metadata, Body: 'B2-K2' }, - ], + { $metadata, Body: 'B1-K1' }, + { $metadata, Body: 'B3-K3' }, + { $metadata, Body: 'B2-K2' }, ]) }) }) @@ -59,7 +50,7 @@ describe('awsBulkSendT', () => { const res = await awsBulkSendT({ client, transformer: (input, output: GetObjectCommandOutput) => { - return { $metadata, Body: `transformed-${output.Body}` } + return [input, { $metadata, Body: `transformed-${output.Body}` }] }, commands: [ new GetObjectCommand({ Bucket: 'B1', Key: 'K1' }), diff --git a/packages/aws-bulk-send/lib/index.ts b/packages/aws-bulk-send/lib/index.ts index 26d2f60..455755c 100644 --- a/packages/aws-bulk-send/lib/index.ts +++ b/packages/aws-bulk-send/lib/index.ts @@ -13,9 +13,9 @@ export const awsBulkSend = async ({ client: Client commands: Command[] options?: { concurrency?: number } -}): Promise<[Input, Output][]> => { +}): Promise => { const limit = pLimit(options?.concurrency ?? 1000) - return Promise.all(commands.map(async (cmd) => [cmd.input, await limit(() => client.send(cmd))])) + return Promise.all(commands.map((cmd) => limit(() => client.send(cmd)))) } export const awsBulkSendT = async ({ @@ -28,9 +28,9 @@ export const awsBulkSendT = async ({ commands: Command[] transformer: (input: Input, output: Output) => TransformedOutput options?: { concurrency?: number } -}): Promise<[Input, TransformedOutput][]> => { +}): Promise => { const limit = pLimit(options?.concurrency ?? 1000) return Promise.all( - commands.map(async (cmd) => [cmd.input, await limit(async () => transformer(cmd.input, await client.send(cmd)))]), + commands.map((cmd) =>limit(async () => transformer(cmd.input, await client.send(cmd)))), ) } From 7420e83f86ab8620db5caa7d0eb0a32108bfaeeb Mon Sep 17 00:00:00 2001 From: Takatoshi Matsumoto Date: Mon, 13 Jun 2022 21:46:59 +0900 Subject: [PATCH 2/2] Bump version of @kidscannon/aws-bulk-send --- packages/aws-bulk-send/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-bulk-send/package.json b/packages/aws-bulk-send/package.json index 23d541d..e0b0d4a 100644 --- a/packages/aws-bulk-send/package.json +++ b/packages/aws-bulk-send/package.json @@ -1,6 +1,6 @@ { "name": "@kidscannon/aws-bulk-send", - "version": "0.0.3", + "version": "0.0.4", "description": "aws bulk send", "keywords": [ "aws",