@trunkrs/common 1.12.4 → 3.0.0

package/services/aws/dynamodb/DynamoDataStorage.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
 const utils_1 = require("./utils");
 const BaseDynamoDataStorage_1 = __importDefault(require("./BaseDynamoDataStorage"));
 const BatchSizeTooBigError_1 = __importDefault(require("./BatchSizeTooBigError"));
@@ -24,21 +25,18 @@ class DynamoDataStorage extends BaseDynamoDataStorage_1.default {
                 [this.tableName]: batch,
             };
             do {
-                const result = await this.documentClient
-                    .batchWrite({
-                    RequestItems: requestItems,
-                })
-                    .promise();
+                const command = new lib_dynamodb_1.BatchWriteCommand({ RequestItems: requestItems });
+                const result = await this.documentClient.send(command);
                 requestItems = result.UnprocessedItems;
             } while (requestItems && Object.keys(requestItems).length > 0);
         }
     }
     async get(key) {
-        const dynamoGetRequest = {
+        const command = new lib_dynamodb_1.GetCommand({
             TableName: this.tableName,
             Key: key,
-        };
-        const result = await this.documentClient.get(dynamoGetRequest).promise();
+        });
+        const result = await this.documentClient.send(command);
         return result.Item ? result.Item : null;
     }
     async batchGet(keys, batchSize = 100) {
@@ -47,14 +45,12 @@ class DynamoDataStorage extends BaseDynamoDataStorage_1.default {
             batches.push(keys.splice(0, batchSize).filter((key) => key));
         }
         const batchResults = await Promise.all(batches.map(async (batch) => {
-            const dynamoBatchGetRequest = {
+            const command = new lib_dynamodb_1.BatchGetCommand({
                 RequestItems: {
                     [this.tableName]: { Keys: batch },
                 },
-            };
-            const results = await this.documentClient
-                .batchGet(dynamoBatchGetRequest)
-                .promise();
+            });
+            const results = await this.documentClient.send(command);
             return ((results.Responses &&
                 results.Responses[this.tableName]) || []);
         }));
@@ -63,42 +59,57 @@ class DynamoDataStorage extends BaseDynamoDataStorage_1.default {
             return results;
         }, []);
     }
-    async find(query) {
-        var _a, _b;
-        const queryOp = (_b = (_a = query.queryOptions) === null || _a === void 0 ? void 0 : _a.operation) !== null && _b !== void 0 ? _b : 'Query';
-        const builderParams = { query, tableName: this.tableName, primaryKeys: this.keys };
-        const ddbQuery = queryOp === 'Scan'
-            ? utils_1.QueryBuilder.buildScan(builderParams)
-            : utils_1.QueryBuilder.buildQuery(builderParams);
-        const result = await this.executeOperation(queryOp, ddbQuery);
-        return result;
+    query(query) {
+        const builderParams = {
+            query,
+            tableName: this.tableName,
+            primaryKeys: this.keys,
+        };
+        const ddbQuery = utils_1.QueryBuilder.buildQuery(builderParams);
+        return this.executeQuery(ddbQuery);
+    }
+    scan(query) {
+        const builderParams = {
+            query,
+            tableName: this.tableName,
+            primaryKeys: this.keys,
+        };
+        const ddbQuery = utils_1.QueryBuilder.buildScan(builderParams);
+        return this.executeScan(ddbQuery);
+    }
+    queryForPage(query, lastEvaluatedKey) {
+        const builderParams = {
+            query,
+            tableName: this.tableName,
+            primaryKeys: this.keys,
+        };
+        const ddbQuery = utils_1.QueryBuilder.buildQuery(builderParams);
+        return this.executePaginatedQuery(ddbQuery, lastEvaluatedKey);
     }
-    async paginatedFind(query, lastEvaluatedKey) {
-        var _a, _b;
-        const queryOp = (_b = (_a = query.queryOptions) === null || _a === void 0 ? void 0 : _a.operation) !== null && _b !== void 0 ? _b : 'Query';
-        const builderParams = { query, tableName: this.tableName, primaryKeys: this.keys };
-        const ddbQuery = queryOp === 'Scan'
-            ? utils_1.QueryBuilder.buildScan(builderParams)
-            : utils_1.QueryBuilder.buildQuery(builderParams);
-        const result = await this.executePaginatedOperation(queryOp, ddbQuery, lastEvaluatedKey);
-        return result;
+    scanForPage(query, lastEvaluatedKey) {
+        const builderParams = {
+            query,
+            tableName: this.tableName,
+            primaryKeys: this.keys,
+        };
+        const ddbQuery = utils_1.QueryBuilder.buildScan(builderParams);
+        return this.executePaginatedScan(ddbQuery, lastEvaluatedKey);
     }
     async findOne(query) {
         const limitedQuery = {
             ...query,
             limit: 1,
         };
-        const [result] = await this.find(limitedQuery);
+        const [result] = await this.query(limitedQuery);
         return result !== null && result !== void 0 ? result : null;
     }
     async remove(entity) {
         const keyPair = this.getKeyPairFromModel(entity);
-        await this.documentClient
-            .delete({
+        const command = new lib_dynamodb_1.DeleteCommand({
             TableName: this.tableName,
             Key: keyPair,
-        })
-            .promise();
+        });
+        await this.documentClient.send(command);
     }
     async batchRemove(entities, batchSize = 24) {
         const keyPairs = entities.map((entity) => this.getKeyPairFromModel(entity));
@@ -119,12 +130,11 @@ class DynamoDataStorage extends BaseDynamoDataStorage_1.default {
         return entities;
     }
     async save(entity) {
-        await this.documentClient
-            .put({
+        const command = new lib_dynamodb_1.PutCommand({
             TableName: this.tableName,
             Item: entity,
-        })
-            .promise();
+        });
+        await this.documentClient.send(command);
         return entity;
     }
 }

package/services/aws/dynamodb/DynamoDataStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"DynamoDataStorage.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/DynamoDataStorage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DynamoDataStorage.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/DynamoDataStorage.ts"],"names":[],"mappings":"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"}

package/services/aws/dynamodb/DynamoIndexDataStorage.d.ts

@@ -2,11 +2,14 @@ import BaseDynamoDataStorage from './BaseDynamoDataStorage';
 import { QueryParameters } from './utils';
 import QueryableDataStorage from './interfaces/QueryableDataStorage';
 import PaginatedFindResult from './interfaces/PaginatedFindResult';
+declare type NewType<TResultEntity> = TResultEntity;
 declare abstract class DynamoIndexDataStorage<TEntity> extends BaseDynamoDataStorage<TEntity> implements QueryableDataStorage<TEntity> {
     protected readonly indexName: string;
     protected constructor(tableName: string, indexName: string);
-    find<TResultEntity = TEntity>(query: QueryParameters<TEntity>): Promise<TResultEntity[]>;
-    paginatedFind<TResultEntity = TEntity>(query: QueryParameters<TEntity>, lastEvaluatedKey?: string): Promise<PaginatedFindResult<TResultEntity>>;
+    query<TResultEntity = TEntity>(query: QueryParameters<TEntity>): Promise<TResultEntity[]>;
+    queryForPage<TResultEntity = TEntity>(query: QueryParameters<TEntity>, lastEvaluatedKey?: string): Promise<PaginatedFindResult<TResultEntity>>;
+    scan<TResultEntity = TEntity>(query: QueryParameters<TEntity>): Promise<NewType<TResultEntity>[]>;
+    scanForPage<TResultEntity = TEntity>(query: QueryParameters<TEntity>, lastEvaluatedKey?: string): Promise<PaginatedFindResult<TResultEntity>>;
     findOne(query: Omit<QueryParameters<TEntity>, 'limit'>): Promise<TEntity | null>;
 }
 export default DynamoIndexDataStorage;

package/services/aws/dynamodb/DynamoIndexDataStorage.js

@@ -10,42 +10,52 @@ class DynamoIndexDataStorage extends BaseDynamoDataStorage_1.default {
         super(tableName);
         this.indexName = indexName;
     }
-    async find(query) {
-        var _a, _b;
-        const queryOp = (_b = (_a = query.queryOptions) === null || _a === void 0 ? void 0 : _a.operation) !== null && _b !== void 0 ? _b : 'Query';
+    query(query) {
         const builderParams = {
             query,
             tableName: this.tableName,
             primaryKeys: this.keys,
             indexName: this.indexName,
         };
-        const ddbQuery = queryOp === 'Scan'
-            ? utils_1.QueryBuilder.buildScan(builderParams)
-            : utils_1.QueryBuilder.buildQuery(builderParams);
-        const result = await this.executeOperation(queryOp, ddbQuery);
-        return result;
+        const ddbQuery = utils_1.QueryBuilder.buildQuery(builderParams);
+        return this.executeQuery(ddbQuery);
     }
-    async paginatedFind(query, lastEvaluatedKey) {
-        var _a, _b;
-        const queryOp = (_b = (_a = query.queryOptions) === null || _a === void 0 ? void 0 : _a.operation) !== null && _b !== void 0 ? _b : 'Query';
+    queryForPage(query, lastEvaluatedKey) {
         const builderParams = {
             query,
             tableName: this.tableName,
             primaryKeys: this.keys,
             indexName: this.indexName,
         };
-        const ddbQuery = queryOp === 'Scan'
-            ? utils_1.QueryBuilder.buildScan(builderParams)
-            : utils_1.QueryBuilder.buildQuery(builderParams);
-        const result = await this.executePaginatedOperation(queryOp, ddbQuery, lastEvaluatedKey);
-        return result;
+        const ddbQuery = utils_1.QueryBuilder.buildQuery(builderParams);
+        return this.executePaginatedQuery(ddbQuery, lastEvaluatedKey);
+    }
+    scan(query) {
+        const builderParams = {
+            query,
+            tableName: this.tableName,
+            primaryKeys: this.keys,
+            indexName: this.indexName,
+        };
+        const ddbQuery = utils_1.QueryBuilder.buildScan(builderParams);
+        return this.executeScan(ddbQuery);
+    }
+    scanForPage(query, lastEvaluatedKey) {
+        const builderParams = {
+            query,
+            tableName: this.tableName,
+            primaryKeys: this.keys,
+            indexName: this.indexName,
+        };
+        const ddbQuery = utils_1.QueryBuilder.buildScan(builderParams);
+        return this.executePaginatedScan(ddbQuery, lastEvaluatedKey);
     }
     async findOne(query) {
         const limitedQuery = {
             ...query,
             limit: 1,
         };
-        const [result] = await this.find(limitedQuery);
+        const [result] = await this.query(limitedQuery);
         return result !== null && result !== void 0 ? result : null;
     }
 }

package/services/aws/dynamodb/DynamoIndexDataStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"DynamoIndexDataStorage.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/DynamoIndexDataStorage.ts"],"names":[],"mappings":";;;;;AAAA,oFAA2D;AAC3D,mCAAuD;AAIvD,MAAe,sBACb,SAAQ,+BAA8B;IAGtC,YACE,SAAiB,EACE,SAAiB;QAEpC,KAAK,CAAC,SAAS,CAAC,CAAA;QAFG,cAAS,GAAT,SAAS,CAAQ;IAGtC,CAAC;IAEM,KAAK,CAAC,IAAI,CACf,KAA+B;;QAE/B,MAAM,OAAO,GAAG,MAAA,MAAA,KAAK,CAAC,YAAY,0CAAE,SAAS,mCAAI,OAAO,CAAA;QACxD,MAAM,aAAa,GAAG;YACpB,KAAK;YACL,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAA;QAED,MAAM,QAAQ,GACZ,OAAO,KAAK,MAAM;YAChB,CAAC,CAAC,oBAAY,CAAC,SAAS,CAAC,aAAa,CAAC;YACvC,CAAC,CAAC,oBAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;QAE5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAgB,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC5E,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,aAAa,CACxB,KAA+B,EAC/B,gBAAyB;;QAEzB,MAAM,OAAO,GAAG,MAAA,MAAA,KAAK,CAAC,YAAY,0CAAE,SAAS,mCAAI,OAAO,CAAA;QACxD,MAAM,aAAa,GAAG;YACpB,KAAK;YACL,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAA;QAED,MAAM,QAAQ,GACZ,OAAO,KAAK,MAAM;YAChB,CAAC,CAAC,oBAAY,CAAC,SAAS,CAAC,aAAa,CAAC;YACvC,CAAC,CAAC,oBAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;QAE5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,yBAAyB,CACjD,OAAO,EACP,QAAQ,EACR,gBAAgB,CACjB,CAAA;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,KAA8C;QAE9C,MAAM,YAAY,GAAG;YACnB,GAAG,KAAK;YACR,KAAK,EAAE,CAAC;SACT,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAC9C,OAAO,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,CAAA;IACvB,CAAC;CACF;AAED,kBAAe,sBAAsB,CAAA"}
+{"version":3,"file":"DynamoIndexDataStorage.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/DynamoIndexDataStorage.ts"],"names":[],"mappings":";;;;;AAAA,oFAA2D;AAC3D,mCAAuD;AAMvD,MAAe,sBACb,SAAQ,+BAA8B;IAGtC,YACE,SAAiB,EACE,SAAiB;QAEpC,KAAK,CAAC,SAAS,CAAC,CAAA;QAFG,cAAS,GAAT,SAAS,CAAQ;IAGtC,CAAC;IAEM,KAAK,CACV,KAA+B;QAE/B,MAAM,aAAa,GAAG;YACpB,KAAK;YACL,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAA;QAED,MAAM,QAAQ,GAAG,oBAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;QAEvD,OAAO,IAAI,CAAC,YAAY,CAAgB,QAAQ,CAAC,CAAA;IACnD,CAAC;IAEM,YAAY,CACjB,KAA+B,EAC/B,gBAAyB;QAEzB,MAAM,aAAa,GAAG;YACpB,KAAK;YACL,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAA;QAED,MAAM,QAAQ,GAAG,oBAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;QAEvD,OAAO,IAAI,CAAC,qBAAqB,CAAgB,QAAQ,EAAE,gBAAgB,CAAC,CAAA;IAC9E,CAAC;IAEM,IAAI,CACT,KAA+B;QAE/B,MAAM,aAAa,GAAG;YACpB,KAAK;YACL,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAA;QAED,MAAM,QAAQ,GAAG,oBAAY,CAAC,SAAS,CAAC,aAAa,CAAC,CAAA;QAEtD,OAAO,IAAI,CAAC,WAAW,CAAgB,QAAQ,CAAC,CAAA;IAClD,CAAC;IAEM,WAAW,CAChB,KAA+B,EAC/B,gBAAyB;QAEzB,MAAM,aAAa,GAAG;YACpB,KAAK;YACL,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAA;QAED,MAAM,QAAQ,GAAG,oBAAY,CAAC,SAAS,CAAC,aAAa,CAAC,CAAA;QAEtD,OAAO,IAAI,CAAC,oBAAoB,CAAgB,QAAQ,EAAE,gBAAgB,CAAC,CAAA;IAC7E,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,KAA8C;QAE9C,MAAM,YAAY,GAAG;YACnB,GAAG,KAAK;YACR,KAAK,EAAE,CAAC;SACT,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC/C,OAAO,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,CAAA;IACvB,CAAC;CACF;AAED,kBAAe,sBAAsB,CAAA"}

package/services/aws/dynamodb/interfaces/QueryableDataStorage.d.ts

@@ -1,6 +1,10 @@
 import { QueryParameters } from '../utils';
+import PaginatedFindResult from './PaginatedFindResult';
 interface QueryableDataStorage<TEntity> {
-    find(query: QueryParameters<TEntity>): Promise<TEntity[]>;
+    query(query: QueryParameters<TEntity>): Promise<TEntity[]>;
+    queryForPage(query: QueryParameters<TEntity>, lastEvaluatedKey?: string): Promise<PaginatedFindResult<TEntity>>;
+    scan(query: QueryParameters<TEntity>): Promise<TEntity[]>;
+    scanForPage(query: QueryParameters<TEntity>, lastEvaluatedKey?: string): Promise<PaginatedFindResult<TEntity>>;
     findOne(query: QueryParameters<TEntity>): Promise<TEntity | null>;
 }
 export default QueryableDataStorage;

package/services/aws/dynamodb/types/DeleteRequest.d.ts

@@ -0,0 +1,4 @@
+interface DeleteRequest {
+    Key: Record<string, any>;
+}
+export default DeleteRequest;

package/services/aws/dynamodb/types/DeleteRequest.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=DeleteRequest.js.map

package/services/aws/dynamodb/types/DeleteRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DeleteRequest.js","sourceRoot":"","sources":["../../../../../services/aws/dynamodb/types/DeleteRequest.ts"],"names":[],"mappings":""}

package/services/aws/dynamodb/types/PutRequest.d.ts

@@ -0,0 +1,4 @@
+interface PutRequest {
+    Item: Record<string, any>;
+}
+export default PutRequest;

package/services/aws/dynamodb/types/PutRequest.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=PutRequest.js.map

package/services/aws/dynamodb/types/PutRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PutRequest.js","sourceRoot":"","sources":["../../../../../services/aws/dynamodb/types/PutRequest.ts"],"names":[],"mappings":""}

package/services/aws/dynamodb/types/WriteRequest.d.ts

@@ -0,0 +1,7 @@
+import DeleteRequest from './DeleteRequest';
+import PutRequest from './PutRequest';
+interface WriteRequest {
+    PutRequest?: PutRequest;
+    DeleteRequest?: DeleteRequest;
+}
+export default WriteRequest;

package/services/aws/dynamodb/types/WriteRequest.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=WriteRequest.js.map

package/services/aws/dynamodb/types/WriteRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WriteRequest.js","sourceRoot":"","sources":["../../../../../services/aws/dynamodb/types/WriteRequest.ts"],"names":[],"mappings":""}

package/services/aws/dynamodb/utils/query/QueryBuilder.d.ts

@@ -1,4 +1,4 @@
-import { DynamoDB } from 'aws-sdk';
+import { ScanCommandInput, QueryCommandInput } from '@aws-sdk/lib-dynamodb';
 import QueryParameters from './QueryParameters';
 export interface QueryBuilderParams<TEntity> {
     query: QueryParameters<TEntity>;
@@ -13,7 +13,7 @@ declare class QueryBuilder {
     private static buildQueryStatements;
     private static buildExpression;
     private static splitKeyAndFilterCondition;
-    static buildScan<TEntity>({ query, tableName, indexName, }: QueryBuilderParams<TEntity>): DynamoDB.DocumentClient.ScanInput;
-    static buildQuery<TEntity>({ query, primaryKeys, tableName, indexName, }: QueryBuilderParams<TEntity>): DynamoDB.DocumentClient.QueryInput;
+    static buildScan<TEntity>({ query, tableName, indexName, }: QueryBuilderParams<TEntity>): ScanCommandInput;
+    static buildQuery<TEntity>({ query, primaryKeys, tableName, indexName, }: QueryBuilderParams<TEntity>): QueryCommandInput;
 }
 export default QueryBuilder;

package/services/aws/dynamodb/utils/query/QueryBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilder.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/query/QueryBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilder.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/query/QueryBuilder.ts"],"names":[],"mappings":"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"}

package/services/aws/dynamodb/utils/query/QueryParameters.d.ts

@@ -1,8 +1,5 @@
 import WhereParameters from './QueryWhereStatement';
 interface QueryParameters<TEntity> {
-    queryOptions?: {
-        operation?: 'Scan' | 'Query';
-    };
     where?: WhereParameters<TEntity>;
     select?: Array<keyof TEntity>;
     limit?: number;

package/services/email/SESTemplateClient.d.ts

@@ -1,12 +1,12 @@
+import { SESClient } from '@aws-sdk/client-ses';
 import Template from '../../models/email/Template';
 import EmailContent from '../../models/email/EmailContent';
 import TemplateClient from './TemplateClient';
-import { SES } from 'aws-sdk';
 import { Cache } from '../../utils/caching';
 declare class SESTemplateClient extends TemplateClient {
     private readonly sesClient;
     private readonly cache;
-    constructor(sesClient: SES, cache: Cache);
+    constructor(sesClient: SESClient, cache: Cache);
     createEmailFromTemplate<TValues>(templateName: string, templateValues: TValues): Promise<EmailContent>;
     getTemplate(templateName: string): Promise<Template>;
     private assignTemplateValues;

package/services/email/SESTemplateClient.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const client_ses_1 = require("@aws-sdk/client-ses");
 const TemplateClient_1 = __importDefault(require("./TemplateClient"));
 const TemplateNotFoundError_1 = __importDefault(require("../../models/errors/email/TemplateNotFoundError"));
 class SESTemplateClient extends TemplateClient_1.default {
@@ -38,9 +39,10 @@ class SESTemplateClient extends TemplateClient_1.default {
         }, {});
     }
     async moveSesTemplateToCache(templateName) {
-        const { Template: sesTemplate } = await this.sesClient
-            .getTemplate({ TemplateName: templateName })
-            .promise();
+        const command = new client_ses_1.GetTemplateCommand({
+            TemplateName: templateName,
+        });
+        const { Template: sesTemplate } = await this.sesClient.send(command);
         if (!sesTemplate) {
             throw new TemplateNotFoundError_1.default(templateName);
         }

package/services/email/SESTemplateClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"SESTemplateClient.js","sourceRoot":"","sources":["../../../services/email/SESTemplateClient.ts"],"names":[],"mappings":";;;;;AAGA,sEAA6C;AAG7C,4GAAmF;AAEnF,MAAM,iBAAkB,SAAQ,wBAAc;IAC5C,YAA6B,SAAc,EAAmB,KAAY;QACxE,KAAK,EAAE,CAAA;QADoB,cAAS,GAAT,SAAS,CAAK;QAAmB,UAAK,GAAL,KAAK,CAAO;IAE1E,CAAC;IAQM,KAAK,CAAC,uBAAuB,CAClC,YAAoB,EACpB,cAAuB;QAEvB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;QAErD,OAAO,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;IAC5D,CAAC;IASM,KAAK,CAAC,WAAW,CAAC,YAAoB;QAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAW,YAAY,CAAC,CAAA;QAE7D,OAAO,QAAQ,IAAI,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAA;IAC9D,CAAC;IAEO,oBAAoB,CAC1B,QAAkB,EAClB,MAAe;QAEf,MAAM,aAAa,GAAG;YACpB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;SAC1B,CAAA;QAED,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CACtC,CAAC,KAAmB,EAAE,YAAoB,EAAE,EAAE;YAC5C,MAAM,WAAW,GAAG,YAA8B,CAAA;YAElD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;gBAC1B,OAAO,KAAK,CAAA;aACb;YAED,MAAM,YAAY,GAAG,iBAAiB,CAAC,qBAAqB,CAC1D,QAAQ,CAAC,WAAW,CAAW,EAC/B,MAAM,CACP,CAAA;YAED,OAAO;gBACL,GAAG,KAAK;gBACR,CAAC,YAAY,CAAC,EAAE,YAAY;aAC7B,CAAA;QACH,CAAC,EACD,EAAkB,CACnB,CAAA;IACH,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAClC,YAAoB;QAEpB,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS;aACnD,WAAW,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;aAC3C,OAAO,EAAE,CAAA;QAEZ,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,+BAAqB,CAAC,YAAY,CAAC,CAAA;SAC9C;QAED,MAAM,QAAQ,GAAG,iBAAiB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAA;QAErE,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAA;QACzB,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAW,IAAI,EAAE,QAAQ,CAAC,CAAA;QAE9C,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEO,MAAM,CAAC,qBAAqB,CAAC,WAAyB;QAC5D,OAAO;YACL,IAAI,EAAE,WAAW,CAAC,YAAY;YAC9B,OAAO,EAAE,WAAW,CAAC,WAAW;YAChC,IAAI,EAAE,WAAW,CAAC,QAAQ;YAC1B,IAAI,EAAE,WAAW,CAAC,QAAQ;SAC3B,CAAA;IACH,CAAC;CACF;AAED,kBAAe,iBAAiB,CAAA"}
+{"version":3,"file":"SESTemplateClient.js","sourceRoot":"","sources":["../../../services/email/SESTemplateClient.ts"],"names":[],"mappings":";;;;;AAAA,oDAI4B;AAI5B,sEAA6C;AAE7C,4GAAmF;AAEnF,MAAM,iBAAkB,SAAQ,wBAAc;IAC5C,YACmB,SAAoB,EACpB,KAAY;QAE7B,KAAK,EAAE,CAAA;QAHU,cAAS,GAAT,SAAS,CAAW;QACpB,UAAK,GAAL,KAAK,CAAO;IAG/B,CAAC;IAQM,KAAK,CAAC,uBAAuB,CAClC,YAAoB,EACpB,cAAuB;QAEvB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;QAErD,OAAO,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;IAC5D,CAAC;IASM,KAAK,CAAC,WAAW,CAAC,YAAoB;QAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAW,YAAY,CAAC,CAAA;QAE7D,OAAO,QAAQ,IAAI,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAA;IAC9D,CAAC;IAEO,oBAAoB,CAC1B,QAAkB,EAClB,MAAe;QAEf,MAAM,aAAa,GAAG;YACpB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;SAC1B,CAAA;QAED,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CACtC,CAAC,KAAmB,EAAE,YAAoB,EAAE,EAAE;YAC5C,MAAM,WAAW,GAAG,YAA8B,CAAA;YAElD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;gBAC1B,OAAO,KAAK,CAAA;aACb;YAED,MAAM,YAAY,GAAG,iBAAiB,CAAC,qBAAqB,CAC1D,QAAQ,CAAC,WAAW,CAAW,EAC/B,MAAM,CACP,CAAA;YAED,OAAO;gBACL,GAAG,KAAK;gBACR,CAAC,YAAY,CAAC,EAAE,YAAY;aAC7B,CAAA;QACH,CAAC,EACD,EAAkB,CACnB,CAAA;IACH,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAClC,YAAoB;QAEpB,MAAM,OAAO,GAAG,IAAI,+BAAkB,CAAC;YACrC,YAAY,EAAE,YAAY;SAC3B,CAAC,CAAA;QAEF,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAEpE,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,+BAAqB,CAAC,YAAY,CAAC,CAAA;SAC9C;QAED,MAAM,QAAQ,GAAG,iBAAiB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAA;QAErE,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAA;QACzB,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAW,IAAI,EAAE,QAAQ,CAAC,CAAA;QAE9C,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEO,MAAM,CAAC,qBAAqB,CAAC,WAAwB;QAC3D,OAAO;YACL,IAAI,EAAE,WAAW,CAAC,YAAsB;YACxC,OAAO,EAAE,WAAW,CAAC,WAAW;YAChC,IAAI,EAAE,WAAW,CAAC,QAAQ;YAC1B,IAAI,EAAE,WAAW,CAAC,QAAQ;SAC3B,CAAA;IACH,CAAC;CACF;AAED,kBAAe,iBAAiB,CAAA"}

package/services/email/__tests__/SESTemplateClient.spec.js

@@ -1,18 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const faker_1 = require("faker");
+const client_ses_1 = require("@aws-sdk/client-ses");
+const aws_sdk_client_mock_1 = require("aws-sdk-client-mock");
 const __1 = require("..");
-const createMockCache = () => ({
-    get: jest.fn(),
-    add: jest.fn(),
-});
-const createMockSES = () => ({
-    getTemplate: jest.fn(),
-});
+function createMockCache() {
+    return {
+        get: jest.fn(),
+        add: jest.fn(),
+    };
+}
 describe('SESTemplateClient', () => {
     let mockCache;
-    let mockSES;
+    const mockSES = (0, aws_sdk_client_mock_1.mockClient)(client_ses_1.SESClient);
     let sut;
+    beforeEach(() => {
+        mockSES.reset();
+        mockCache = createMockCache();
+        sut = new __1.SESTemplateClient(mockSES, mockCache);
+    });
     describe('createEmailFromTemplate', () => {
         mockCache = createMockCache();
         const templateName = 'The template name';
@@ -32,11 +38,7 @@ describe('SESTemplateClient', () => {
             html: `<html><body> An email body from ${templateValues.name} of ${templateValues.company} </body></html>`,
         };
         it('Should create valid email content from an SES template', async () => {
-            mockSES = createMockSES();
-            mockSES.getTemplate.mockImplementation(() => ({
-                promise: jest.fn().mockResolvedValue(sesTemplate),
-            }));
-            sut = new __1.SESTemplateClient(mockSES, mockCache);
+            mockSES.on(client_ses_1.GetTemplateCommand).resolves(sesTemplate);
             const email = await sut.createEmailFromTemplate(templateName, templateValues);
             expect(email).toEqual(expected);
         });

package/services/email/__tests__/SESTemplateClient.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"SESTemplateClient.spec.js","sourceRoot":"","sources":["../../../../services/email/__tests__/SESTemplateClient.spec.ts"],"names":[],"mappings":";;AAAA,iCAAqC;AAErC,0BAAsC;AAGtC,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,CAAC;IAC7B,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;IACd,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;CACf,CAAC,CAAA;AAEF,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,CAAC;IAC3B,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE;CACvB,CAAC,CAAA;AAEF,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,IAAI,SAA6C,CAAA;IACjD,IAAI,OAAyC,CAAA;IAC7C,IAAI,GAAsB,CAAA;IAE1B,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,SAAS,GAAG,eAAe,EAAE,CAAA;QAC7B,MAAM,YAAY,GAAG,mBAAmB,CAAA;QACxC,MAAM,WAAW,GAAG;YAClB,QAAQ,EAAE;gBACR,YAAY,EAAE,YAAY;gBAC1B,WAAW,EAAE,gCAAgC;gBAC7C,QAAQ,EACN,wEAAwE;aAC3E;SACF,CAAA;QAED,MAAM,cAAc,GAAG;YACrB,IAAI,EAAE,YAAI,CAAC,SAAS,EAAE;YACtB,OAAO,EAAE,eAAO,CAAC,WAAW,EAAE;SAC/B,CAAA;QAED,MAAM,QAAQ,GAAG;YACf,OAAO,EAAE,yBAAyB,cAAc,CAAC,IAAI,EAAE;YACvD,IAAI,EAAE,mCAAmC,cAAc,CAAC,IAAI,OAAO,cAAc,CAAC,OAAO,iBAAiB;SAC3G,CAAA;QAED,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,OAAO,GAAG,aAAa,EAAE,CAAA;YACzB,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC5C,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC;aAClD,CAAC,CAAC,CAAA;YAEH,GAAG,GAAG,IAAI,qBAAiB,CACzB,OAAyB,EACzB,SAA6B,CAC9B,CAAA;YAED,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,uBAAuB,CAC7C,YAAY,EACZ,cAAc,CACf,CAAA;YAED,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;YAC1F,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,gCAAgC;gBACzC,IAAI,EAAE,wEAAwE;aAC/E,CAAA;YAED,SAAS,CAAC,GAAG,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAA;YAE7C,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,uBAAuB,CAC7C,YAAY,EACZ,cAAc,CACf,CAAA;YAED,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"SESTemplateClient.spec.js","sourceRoot":"","sources":["../../../../services/email/__tests__/SESTemplateClient.spec.ts"],"names":[],"mappings":";;AAAA,iCAAqC;AACrC,oDAAmE;AACnE,6DAAgD;AAEhD,0BAAsC;AAGtC,SAAS,eAAe;IACtB,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;QACd,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;KACf,CAAA;AACH,CAAC;AAED,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,IAAI,SAA6C,CAAA;IACjD,MAAM,OAAO,GAAG,IAAA,gCAAU,EAAC,sBAAS,CAAC,CAAA;IACrC,IAAI,GAAsB,CAAA;IAE1B,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,CAAC,KAAK,EAAE,CAAA;QACf,SAAS,GAAG,eAAe,EAAE,CAAA;QAC7B,GAAG,GAAG,IAAI,qBAAiB,CACzB,OAA+B,EAC/B,SAA6B,CAC9B,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,SAAS,GAAG,eAAe,EAAE,CAAA;QAC7B,MAAM,YAAY,GAAG,mBAAmB,CAAA;QACxC,MAAM,WAAW,GAAG;YAClB,QAAQ,EAAE;gBACR,YAAY,EAAE,YAAY;gBAC1B,WAAW,EAAE,gCAAgC;gBAC7C,QAAQ,EACN,wEAAwE;aAC3E;SACF,CAAA;QAED,MAAM,cAAc,GAAG;YACrB,IAAI,EAAE,YAAI,CAAC,SAAS,EAAE;YACtB,OAAO,EAAE,eAAO,CAAC,WAAW,EAAE;SAC/B,CAAA;QAED,MAAM,QAAQ,GAAG;YACf,OAAO,EAAE,yBAAyB,cAAc,CAAC,IAAI,EAAE;YACvD,IAAI,EAAE,mCAAmC,cAAc,CAAC,IAAI,OAAO,cAAc,CAAC,OAAO,iBAAiB;SAC3G,CAAA;QAED,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,OAAO,CAAC,EAAE,CAAC,+BAAkB,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;YAEpD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,uBAAuB,CAC7C,YAAY,EACZ,cAAc,CACf,CAAA;YAED,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;YAC1F,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,gCAAgC;gBACzC,IAAI,EAAE,wEAAwE;aAC/E,CAAA;YAED,SAAS,CAAC,GAAG,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAA;YAE7C,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,uBAAuB,CAC7C,YAAY,EACZ,cAAc,CACf,CAAA;YAED,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/services/queue/EventBridgeClient.js

@@ -1,22 +1,17 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const getAWS_1 = __importDefault(require("../../utils/getAWS"));
-const { EventBridge } = (0, getAWS_1.default)();
+const client_eventbridge_1 = require("@aws-sdk/client-eventbridge");
 class EventBridgeClient {
     constructor(serializer, sourceName, busName, detailType) {
         this.serializer = serializer;
         this.sourceName = sourceName;
         this.busName = busName;
         this.detailType = detailType;
-        this.client = new EventBridge();
+        this.client = new client_eventbridge_1.EventBridgeClient();
     }
     async sendMessage(request) {
         var _a, _b, _c;
-        await this.client
-            .putEvents({
+        const command = new client_eventbridge_1.PutEventsCommand({
             Entries: [
                 {
                     EventBusName: this.busName,
@@ -26,12 +21,11 @@ class EventBridgeClient {
                     Resources: (_c = request.options) === null || _c === void 0 ? void 0 : _c.resources,
                 },
             ],
-        })
-            .promise();
+        });
+        await this.client.send(command);
     }
     async sendBatchMessage(request) {
-        await this.client
-            .putEvents({
+        const command = new client_eventbridge_1.PutEventsCommand({
             Entries: request.messages.map((message) => {
                 var _a, _b, _c;
                 return ({
@@ -42,8 +36,8 @@ class EventBridgeClient {
                     Resources: (_c = request.options) === null || _c === void 0 ? void 0 : _c.resources,
                 });
             }),
-        })
-            .promise();
+        });
+        await this.client.send(command);
     }
 }
 exports.default = EventBridgeClient;

package/services/queue/EventBridgeClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventBridgeClient.js","sourceRoot":"","sources":["../../../services/queue/EventBridgeClient.ts"],"names":[],"mappings":";;;;;AAQA,gEAAuC;AAEvC,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAA;AAEhC,MAAM,iBAAiB;IAGrB,YAImB,UAAsB,EAItB,UAAmB,EAInB,OAAgB,EAKhB,UAAmB;QAbnB,eAAU,GAAV,UAAU,CAAY;QAItB,eAAU,GAAV,UAAU,CAAS;QAInB,YAAO,GAAP,OAAO,CAAS;QAKhB,eAAU,GAAV,UAAU,CAAS;QAnBrB,WAAM,GAAG,IAAI,WAAW,EAAE,CAAA;IAoBxC,CAAC;IAEG,KAAK,CAAC,WAAW,CACtB,OAAiE;;QAEjE,MAAM,IAAI,CAAC,MAAM;aACd,SAAS,CAAC;YACT,OAAO,EAAE;gBACP;oBACE,YAAY,EAAE,IAAI,CAAC,OAAO;oBAC1B,MAAM,EAAE,IAAI,CAAC,UAAU;oBACvB,UAAU,EAAE,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,UAAU,mCAAI,IAAI,CAAC,UAAU;oBAC1D,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC;oBAC5D,SAAS,EAAE,MAAA,OAAO,CAAC,OAAO,0CAAE,SAAS;iBACtC;aACF;SACF,CAAC;aACD,OAAO,EAAE,CAAA;IACd,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,OAAsE;QAEtE,MAAM,IAAI,CAAC,MAAM;aACd,SAAS,CAAC;YACT,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;;gBAAC,OAAA,CAAC;oBAC1C,YAAY,EAAE,IAAI,CAAC,OAAO;oBAC1B,MAAM,EAAE,IAAI,CAAC,UAAU;oBACvB,UAAU,EAAE,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,UAAU,mCAAI,IAAI,CAAC,UAAU;oBAC1D,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC;oBACpD,SAAS,EAAE,MAAA,OAAO,CAAC,OAAO,0CAAE,SAAS;iBACtC,CAAC,CAAA;aAAA,CAAC;SACJ,CAAC;aACD,OAAO,EAAE,CAAA;IACd,CAAC;CACF;AAED,kBAAe,iBAAiB,CAAA"}
+{"version":3,"file":"EventBridgeClient.js","sourceRoot":"","sources":["../../../services/queue/EventBridgeClient.ts"],"names":[],"mappings":";;AAAA,oEAGoC;AAWpC,MAAM,iBAAiB;IAGrB,YAImB,UAAsB,EAItB,UAAmB,EAInB,OAAgB,EAKhB,UAAmB;QAbnB,eAAU,GAAV,UAAU,CAAY;QAItB,eAAU,GAAV,UAAU,CAAS;QAInB,YAAO,GAAP,OAAO,CAAS;QAKhB,eAAU,GAAV,UAAU,CAAS;QAnBrB,WAAM,GAAG,IAAI,sCAAoB,EAAE,CAAA;IAoBjD,CAAC;IAEG,KAAK,CAAC,WAAW,CACtB,OAAiE;;QAEjE,MAAM,OAAO,GAAG,IAAI,qCAAgB,CAAC;YACnC,OAAO,EAAE;gBACP;oBACE,YAAY,EAAE,IAAI,CAAC,OAAO;oBAC1B,MAAM,EAAE,IAAI,CAAC,UAAU;oBACvB,UAAU,EAAE,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,UAAU,mCAAI,IAAI,CAAC,UAAU;oBAC1D,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC;oBAC5D,SAAS,EAAE,MAAA,OAAO,CAAC,OAAO,0CAAE,SAAS;iBACtC;aACF;SACF,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACjC,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,OAAsE;QAEtE,MAAM,OAAO,GAAG,IAAI,qCAAgB,CAAC;YACnC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;;gBAAC,OAAA,CAAC;oBAC1C,YAAY,EAAE,IAAI,CAAC,OAAO;oBAC1B,MAAM,EAAE,IAAI,CAAC,UAAU;oBACvB,UAAU,EAAE,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,UAAU,mCAAI,IAAI,CAAC,UAAU;oBAC1D,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC;oBACpD,SAAS,EAAE,MAAA,OAAO,CAAC,OAAO,0CAAE,SAAS;iBACtC,CAAC,CAAA;aAAA,CAAC;SACJ,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACjC,CAAC;CACF;AAED,kBAAe,iBAAiB,CAAA"}

package/services/queue/KinesisClient.d.ts

@@ -1,4 +1,4 @@
-import AWS from 'aws-sdk';
+import { KinesisClient as AWSKinesisClient } from '@aws-sdk/client-kinesis';
 import { Serializer } from '../../utils/serialization';
 import { QueueClient, KinesisMessageOptions, QueueBatchMessageRequest, QueueMessageRequest } from './QueueClient';
 declare class KinesisClient implements QueueClient {
@@ -6,7 +6,7 @@ declare class KinesisClient implements QueueClient {
     private readonly streamName;
     private readonly serializer;
     private readonly defaultPartition;
-    constructor(client: AWS.Kinesis, streamName: string, serializer: Serializer, defaultPartition: string);
+    constructor(client: AWSKinesisClient, streamName: string, serializer: Serializer, defaultPartition: string);
     sendMessage<TMessage>(request: QueueMessageRequest<TMessage, KinesisMessageOptions>): Promise<void>;
     sendBatchMessage<TMessage>(request: QueueBatchMessageRequest<TMessage, KinesisMessageOptions>): Promise<void>;
 }