@trunkrs/common 1.12.5 → 4.0.1

package/package.json

@@ -1,31 +1,45 @@
 {
   "name": "@trunkrs/common",
-  "version": "1.12.5",
+  "version": "4.0.1",
   "description": "Common standards library for development in Trunkrs",
   "types": "./index.d.ts",
   "repository": "https://github.com/Trunkrs/common.git",
   "author": "Leonard Breitkopf <leonard@trunkrs.nl>",
   "license": "MIT",
   "dependencies": {
-    "aws-xray-sdk": "^3.3.4",
     "axios": "^0.22.0",
     "qs": "^6.10.1",
     "deepmerge": "^4.2.2"
   },
   "devDependencies": {
-    "@types/aws-lambda": "^8.10.92",
+    "@aws-sdk/client-dynamodb": "^3.421.0",
+    "@aws-sdk/client-eventbridge": "^3.421.0",
+    "@aws-sdk/client-kinesis": "^3.421.0",
+    "@aws-sdk/client-lambda": "^3.421.0",
+    "@aws-sdk/client-s3": "^3.421.0",
+    "@aws-sdk/client-secrets-manager": "^3.423.0",
+    "@aws-sdk/client-ses": "^3.421.0",
+    "@aws-sdk/client-sfn": "^3.423.0",
+    "@aws-sdk/client-sns": "^3.421.0",
+    "@aws-sdk/client-sqs": "^3.421.0",
+    "@aws-sdk/client-ssm": "^3.421.0",
+    "@aws-sdk/lib-dynamodb": "^3.421.0",
+    "@aws-sdk/util-dynamodb": "^3.421.0",
+    "@types/aws-lambda": "^8.10.122",
     "@types/faker": "^5.5.8",
     "@types/jest": "^27.0.1",
     "@types/joi": "^17.2.3",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/node": "^14.11.2",
-    "@types/nodemailer": "^6.4.4",
+    "@types/nodemailer": "^6.4.11",
     "@types/qs": "^6.9.7",
     "@types/typescript": "^2.0.0",
     "@types/uuid": "^8.3.1",
     "@typescript-eslint/eslint-plugin": "^4.0.1",
     "@typescript-eslint/parser": "^4.0.1",
     "aws-lambda": "^1.0.6",
+    "aws-sdk-client-mock": "^3.0.0",
+    "aws-xray-sdk-core": "^3.5.2",
     "concurrently": "^6.2.1",
     "eslint": "^7.10.0",
     "eslint-config-airbnb-base-typescript-prettier": "^3.1.1",
@@ -51,7 +65,6 @@
     "@typescript-eslint/eslint-plugin": ">=4 || <5",
     "@typescript-eslint/parser": ">=4 || <5",
     "redis": ">=4 || <5",
-    "aws-sdk": ">2.1000.0 || <3",
     "date-fns": ">=2 || <3",
     "eslint": ">=7.2.0",
     "eslint-config-airbnb-base-typescript-prettier": ">=3.1 || <4",
@@ -60,6 +73,20 @@
     "jsonwebtoken": "8",
     "uuid": "8",
     "prettier": ">=2",
-    "ts-jest": ">=21"
+    "ts-jest": ">=21",
+    "@aws-sdk/client-dynamodb": "^3.421.0 || < 4",
+    "@aws-sdk/client-eventbridge": "^3.421.0 || < 4",
+    "@aws-sdk/client-kinesis": "^3.421.0 || < 4",
+    "@aws-sdk/client-lambda": "^3.421.0 || < 4",
+    "@aws-sdk/client-s3": "^3.421.0 || < 4",
+    "@aws-sdk/client-secrets-manager": "^3.423.0 || < 4",
+    "@aws-sdk/client-ses": "^3.421.0 || <4",
+    "@aws-sdk/client-sfn": "^3.423.0 || <4",
+    "@aws-sdk/client-sns": "^3.421.0 || <4",
+    "@aws-sdk/client-sqs": "^3.421.0 || <4",
+    "@aws-sdk/client-ssm": "^3.421.0 || <4",
+    "@aws-sdk/lib-dynamodb": "^3.421.0 || <4",
+    "@aws-sdk/util-dynamodb": "^3.421.0 || <4",
+    "aws-xray-sdk-core": "^3.5.2 || <4"
   }
 }

package/providers/email.d.ts

@@ -13,5 +13,6 @@ export interface ConfigureEmailClientsRequest {
 }
 export declare const NodemailerClient: symbol;
 export declare const SesNodemailerClient: symbol;
+export declare const SESClientSymbol: symbol;
 export declare const TemplateFileCache: symbol;
 export declare const configureEmailClients: (request: ConfigureEmailClientsRequest) => ServiceProvider;

package/providers/email.js

@@ -22,9 +22,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configureEmailClients = exports.TemplateFileCache = exports.SesNodemailerClient = exports.NodemailerClient = void 0;
+exports.configureEmailClients = exports.TemplateFileCache = exports.SESClientSymbol = exports.SesNodemailerClient = exports.NodemailerClient = void 0;
 const nodemailer_1 = require("nodemailer");
-const aws_sdk_1 = require("aws-sdk");
+const client_ses_1 = require("@aws-sdk/client-ses");
 const service_provider_1 = __importStar(require("../utils/service-provider"));
 const aws_1 = __importDefault(require("./aws"));
 const email_1 = require("../services/email");
@@ -32,17 +32,18 @@ const caching_1 = require("../utils/caching");
 const utils_1 = __importStar(require("./utils"));
 exports.NodemailerClient = service_provider_1.default.createSymbol('NodemailerClient');
 exports.SesNodemailerClient = service_provider_1.default.createSymbol('SesNodemailerClient');
+exports.SESClientSymbol = service_provider_1.default.createSymbol('SESClient');
 exports.TemplateFileCache = service_provider_1.default.createSymbol('TemplateCache');
 const configureEmailClients = (request) => {
     const serviceProvider = new service_provider_1.default();
     serviceProvider.register(exports.NodemailerClient, service_provider_1.Lifecycle.Singleton, () => (0, nodemailer_1.createTransport)({
-        SES: aws_1.default.provide(aws_sdk_1.SES),
+        SES: aws_1.default.provide(exports.SESClientSymbol),
     }));
     serviceProvider.register(exports.TemplateFileCache, service_provider_1.Lifecycle.Singleton, () => new caching_1.FileCache(utils_1.default.provide(utils_1.Serializer), 7200000, null, request.templateCacheMountPath));
-    aws_1.default.register(aws_sdk_1.SES, service_provider_1.Lifecycle.Singleton, () => new aws_sdk_1.SES({
+    aws_1.default.register(exports.SESClientSymbol, service_provider_1.Lifecycle.Singleton, () => new client_ses_1.SESClient({
         region: request.sesRegion,
     }));
-    serviceProvider.register(email_1.SESTemplateClient, service_provider_1.Lifecycle.Singleton, () => new email_1.SESTemplateClient(aws_1.default.provide(aws_sdk_1.SES), serviceProvider.provide(exports.TemplateFileCache)));
+    serviceProvider.register(email_1.SESTemplateClient, service_provider_1.Lifecycle.Singleton, () => new email_1.SESTemplateClient(aws_1.default.provide(exports.SESClientSymbol), serviceProvider.provide(exports.TemplateFileCache)));
     serviceProvider.register(exports.SesNodemailerClient, service_provider_1.Lifecycle.Singleton, () => new email_1.NodemailerEmailClient({
         mailer: serviceProvider.provide(exports.NodemailerClient),
         templateClient: serviceProvider.provide(email_1.SESTemplateClient),

package/providers/email.js.map

@@ -1 +1 @@
-{"version":3,"file":"email.js","sourceRoot":"","sources":["../../providers/email.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAE5C,qCAA6B;AAC7B,8EAAsE;AAEtE,gDAA+B;AAC/B,6CAI0B;AAC1B,8CAAmD;AACnD,iDAAmD;AActC,QAAA,gBAAgB,GAC3B,0BAAe,CAAC,YAAY,CAAO,kBAAkB,CAAC,CAAA;AAE3C,QAAA,mBAAmB,GAAG,0BAAe,CAAC,YAAY,CAC7D,qBAAqB,CACtB,CAAA;AAEY,QAAA,iBAAiB,GAC5B,0BAAe,CAAC,YAAY,CAAQ,eAAe,CAAC,CAAA;AAE/C,MAAM,qBAAqB,GAAG,CACnC,OAAqC,EACpB,EAAE;IACnB,MAAM,eAAe,GAAG,IAAI,0BAAe,EAAE,CAAA;IAE7C,eAAe,CAAC,QAAQ,CAAC,wBAAgB,EAAE,4BAAS,CAAC,SAAS,EAAE,GAAG,EAAE,CACnE,IAAA,4BAAe,EAAC;QACd,GAAG,EAAE,aAAW,CAAC,OAAO,CAAC,aAAG,CAAC;KAC9B,CAAC,CACH,CAAA;IAED,eAAe,CAAC,QAAQ,CACtB,yBAAiB,EACjB,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,mBAAS,CACX,eAAa,CAAC,OAAO,CAAC,kBAAU,CAAC,EACjC,OAAO,EACP,IAAI,EACJ,OAAO,CAAC,sBAAsB,CAC/B,CACJ,CAAA;IAED,aAAW,CAAC,QAAQ,CAClB,aAAG,EACH,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,aAAG,CAAC;QACN,MAAM,EAAE,OAAO,CAAC,SAAS;KAC1B,CAAC,CACL,CAAA;IAED,eAAe,CAAC,QAAQ,CACtB,yBAAiB,EACjB,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,yBAAiB,CACnB,aAAW,CAAC,OAAO,CAAC,aAAG,CAAC,EACxB,eAAe,CAAC,OAAO,CAAC,yBAAiB,CAAC,CAC3C,CACJ,CAAA;IAED,eAAe,CAAC,QAAQ,CACtB,2BAAmB,EACnB,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,6BAAqB,CAAC;QACxB,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,wBAAgB,CAAC;QACjD,cAAc,EAAE,eAAe,CAAC,OAAO,CAAC,yBAAiB,CAAC;QAC1D,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,IAAI;QACxC,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,IAAI;QAC9C,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,wBAAwB,EAAE,OAAO,CAAC,wBAAwB;KAC3D,CAAC,CACL,CAAA;IAED,OAAO,eAAe,CAAA;AACxB,CAAC,CAAA;AA3DY,QAAA,qBAAqB,yBA2DjC"}
+{"version":3,"file":"email.js","sourceRoot":"","sources":["../../providers/email.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAE5C,oDAA+C;AAE/C,8EAAsE;AAEtE,gDAA+B;AAC/B,6CAI0B;AAC1B,8CAAmD;AACnD,iDAAmD;AActC,QAAA,gBAAgB,GAC3B,0BAAe,CAAC,YAAY,CAAO,kBAAkB,CAAC,CAAA;AAE3C,QAAA,mBAAmB,GAAG,0BAAe,CAAC,YAAY,CAC7D,qBAAqB,CACtB,CAAA;AAEY,QAAA,eAAe,GAC1B,0BAAe,CAAC,YAAY,CAAY,WAAW,CAAC,CAAA;AACzC,QAAA,iBAAiB,GAC5B,0BAAe,CAAC,YAAY,CAAQ,eAAe,CAAC,CAAA;AAE/C,MAAM,qBAAqB,GAAG,CACnC,OAAqC,EACpB,EAAE;IACnB,MAAM,eAAe,GAAG,IAAI,0BAAe,EAAE,CAAA;IAE7C,eAAe,CAAC,QAAQ,CAAC,wBAAgB,EAAE,4BAAS,CAAC,SAAS,EAAE,GAAG,EAAE,CACnE,IAAA,4BAAe,EAAC;QACd,GAAG,EAAE,aAAW,CAAC,OAAO,CAAC,uBAAe,CAAC;KAC1C,CAAC,CACH,CAAA;IAED,eAAe,CAAC,QAAQ,CACtB,yBAAiB,EACjB,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,mBAAS,CACX,eAAa,CAAC,OAAO,CAAC,kBAAU,CAAC,EACjC,OAAO,EACP,IAAI,EACJ,OAAO,CAAC,sBAAsB,CAC/B,CACJ,CAAA;IAED,aAAW,CAAC,QAAQ,CAClB,uBAAe,EACf,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,sBAAS,CAAC;QACZ,MAAM,EAAE,OAAO,CAAC,SAAS;KAC1B,CAAC,CACL,CAAA;IAED,eAAe,CAAC,QAAQ,CACtB,yBAAiB,EACjB,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,yBAAiB,CACnB,aAAW,CAAC,OAAO,CAAC,uBAAe,CAAC,EACpC,eAAe,CAAC,OAAO,CAAC,yBAAiB,CAAC,CAC3C,CACJ,CAAA;IAED,eAAe,CAAC,QAAQ,CACtB,2BAAmB,EACnB,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,6BAAqB,CAAC;QACxB,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,wBAAgB,CAAC;QACjD,cAAc,EAAE,eAAe,CAAC,OAAO,CAAC,yBAAiB,CAAC;QAC1D,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,IAAI;QACxC,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,IAAI;QAC9C,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,wBAAwB,EAAE,OAAO,CAAC,wBAAwB;KAC3D,CAAC,CACL,CAAA;IAED,OAAO,eAAe,CAAA;AACxB,CAAC,CAAA;AA3DY,QAAA,qBAAqB,yBA2DjC"}

package/services/aws/LambdaClient/LambdaInvocationFailedError.d.ts

@@ -1,5 +1,5 @@
 import ErrorBase from '../../../models/errors/ErrorBase';
 declare class LambdaInvocationFailedError extends ErrorBase {
-    constructor(error?: any);
+    constructor(logs: string, error?: any);
 }
 export default LambdaInvocationFailedError;

package/services/aws/LambdaClient/LambdaInvocationFailedError.js

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ErrorBase_1 = __importDefault(require("../../../models/errors/ErrorBase"));
 class LambdaInvocationFailedError extends ErrorBase_1.default {
-    constructor(error) {
+    constructor(logs, error) {
         super();
-        this.message =
-            `Lambda Invocation Failed with error: ${JSON.stringify(error, null, 2)}`;
+        this.message = `Lambda Invocation Failed with error: ${JSON.stringify(error, null, 2)}. Last 4KB of executed lambda logs: ${logs}
+    `;
         Error.captureStackTrace(this);
     }
 }

package/services/aws/LambdaClient/LambdaInvocationFailedError.js.map

@@ -1 +1 @@
-{"version":3,"file":"LambdaInvocationFailedError.js","sourceRoot":"","sources":["../../../../services/aws/LambdaClient/LambdaInvocationFailedError.ts"],"names":[],"mappings":";;;;;AAAA,iFAAwD;AAExD,MAAM,2BAA4B,SAAQ,mBAAS;IACjD,YAAmB,KAAW;QAC5B,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO;YACV,wCAAwC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAA;QAC1E,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;IAC/B,CAAC;CACF;AAED,kBAAe,2BAA2B,CAAA"}
+{"version":3,"file":"LambdaInvocationFailedError.js","sourceRoot":"","sources":["../../../../services/aws/LambdaClient/LambdaInvocationFailedError.ts"],"names":[],"mappings":";;;;;AAAA,iFAAwD;AAExD,MAAM,2BAA4B,SAAQ,mBAAS;IACjD,YAAmB,IAAY,EAAE,KAAW;QAC1C,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO,GAAG,wCAAwC,IAAI,CAAC,SAAS,CACnE,KAAK,EACL,IAAI,EACJ,CAAC,CACF,uCAAuC,IAAI;KAC3C,CAAA;QAED,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;IAC/B,CAAC;CACF;AAED,kBAAe,2BAA2B,CAAA"}

package/services/aws/LambdaClient/index.d.ts

@@ -1,9 +1,10 @@
+import { LambdaClient as AWSLambdaClient } from '@aws-sdk/client-lambda';
 import { Serializer } from '../../../utils/serialization';
 declare class LambdaClient<TResponse = unknown, TInvokeArgs = unknown> {
     protected readonly functionArn: string;
     protected readonly serializer: Serializer;
-    protected readonly lambdaInstance: AWS.Lambda;
-    constructor(functionArn: string, serializer: Serializer, lambdaInstance: AWS.Lambda);
+    protected readonly lambdaInstance: AWSLambdaClient;
+    constructor(functionArn: string, serializer: Serializer, lambdaInstance: AWSLambdaClient);
     invokeLambda(args?: TInvokeArgs): Promise<TResponse | void>;
 }
 export default LambdaClient;

package/services/aws/LambdaClient/index.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_lambda_1 = require("@aws-sdk/client-lambda");
 const LambdaInvocationFailedError_1 = __importDefault(require("./LambdaInvocationFailedError"));
 class LambdaClient {
     constructor(functionArn, serializer, lambdaInstance) {
@@ -11,15 +12,16 @@ class LambdaClient {
         this.lambdaInstance = lambdaInstance;
     }
     async invokeLambda(args) {
-        const serializedInput = !!args
+        const serializedInput = args
             ? this.serializer.serialize(args, 'string')
             : undefined;
-        const result = await this.lambdaInstance.invoke({
+        const command = new client_lambda_1.InvokeCommand({
             Payload: serializedInput,
             FunctionName: this.functionArn,
-        }).promise();
+        });
+        const result = await this.lambdaInstance.send(command);
         if (result.FunctionError) {
-            throw new LambdaInvocationFailedError_1.default(result.FunctionError);
+            throw new LambdaInvocationFailedError_1.default(result.LogResult, result.FunctionError);
         }
         if (!result.Payload) {
             return;

package/services/aws/LambdaClient/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../services/aws/LambdaClient/index.ts"],"names":[],"mappings":";;;;;AACA,gGAAuE;AAEvE,MAAM,YAAY;IAChB,YACqB,WAAmB,EACnB,UAAsB,EACtB,cAA0B;QAF1B,gBAAW,GAAX,WAAW,CAAQ;QACnB,eAAU,GAAV,UAAU,CAAY;QACtB,mBAAc,GAAd,cAAc,CAAY;IAC5C,CAAC;IAEG,KAAK,CAAC,YAAY,CAAC,IAAkB;QAC1C,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI;YAC5B,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC;YAC3C,CAAC,CAAC,SAAS,CAAA;QAEb,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;YAC9C,OAAO,EAAE,eAAe;YACxB,YAAY,EAAE,IAAI,CAAC,WAAW;SAC/B,CAAC,CAAC,OAAO,EAAE,CAAA;QAGZ,IAAI,MAAM,CAAC,aAAa,EAAE;YACxB,MAAM,IAAI,qCAA2B,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;SAC5D;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,OAAM;SACP;QAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CACpD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAiB,CAAC,CACtC,CAAA;QAED,OAAO,kBAAkB,CAAA;IAC3B,CAAC;CACF;AAED,kBAAe,YAAY,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../services/aws/LambdaClient/index.ts"],"names":[],"mappings":";;;;;AAAA,0DAG+B;AAG/B,gGAAuE;AAEvE,MAAM,YAAY;IAChB,YACqB,WAAmB,EACnB,UAAsB,EACtB,cAA+B;QAF/B,gBAAW,GAAX,WAAW,CAAQ;QACnB,eAAU,GAAV,UAAU,CAAY;QACtB,mBAAc,GAAd,cAAc,CAAiB;IACjD,CAAC;IAEG,KAAK,CAAC,YAAY,CAAC,IAAkB;QAC1C,MAAM,eAAe,GAAG,IAAI;YAC1B,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC;YAC3C,CAAC,CAAC,SAAS,CAAA;QAEb,MAAM,OAAO,GAAG,IAAI,6BAAa,CAAC;YAChC,OAAO,EAAE,eAAe;YACxB,YAAY,EAAE,IAAI,CAAC,WAAW;SAC/B,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAEtD,IAAI,MAAM,CAAC,aAAa,EAAE;YACxB,MAAM,IAAI,qCAA2B,CACnC,MAAM,CAAC,SAAmB,EAC1B,MAAM,CAAC,aAAa,CACrB,CAAA;SACF;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,OAAM;SACP;QAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CACpD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAC5B,CAAA;QAED,OAAO,kBAAkB,CAAA;IAC3B,CAAC;CACF;AAED,kBAAe,YAAY,CAAA"}

package/services/aws/SecretsClient.js

@@ -1,20 +1,15 @@
 "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 { SecretsManager } = (0, getAWS_1.default)();
+const client_secrets_manager_1 = require("@aws-sdk/client-secrets-manager");
 class SecretsClient {
     constructor(cache) {
         this.cache = cache;
-        this.secretsManager = new SecretsManager();
+        this.secretsManager = new client_secrets_manager_1.SecretsManagerClient();
     }
     async getSecretValue(secretName) {
         const getSecret = async () => {
-            const secret = await this.secretsManager
-                .getSecretValue({ SecretId: secretName })
-                .promise();
+            const command = new client_secrets_manager_1.GetSecretValueCommand({ SecretId: secretName });
+            const secret = await this.secretsManager.send(command);
             return secret.SecretString;
         };
         if (this.cache) {
@@ -24,12 +19,11 @@ class SecretsClient {
         return getSecret();
     }
     async updateSecretValue(secretName, secretValue) {
-        await this.secretsManager
-            .putSecretValue({
+        const command = new client_secrets_manager_1.PutSecretValueCommand({
             SecretId: secretName,
             SecretString: secretValue,
-        })
-            .promise();
+        });
+        await this.secretsManager.send(command);
         if (this.cache) {
             const isCacheNotEmpty = await this.cache.hasKey(secretName);
             if (isCacheNotEmpty) {

package/services/aws/SecretsClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"SecretsClient.js","sourceRoot":"","sources":["../../../services/aws/SecretsClient.ts"],"names":[],"mappings":";;;;;AACA,gEAAuC;AAEvC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAA;AAEnC,MAAM,aAAa;IAGjB,YAAoC,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;QAFhC,mBAAc,GAAG,IAAI,cAAc,EAAE,CAAA;IAEF,CAAC;IAE9C,KAAK,CAAC,cAAc,CAAC,UAAkB;QAC5C,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;YAC3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc;iBACrC,cAAc,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;iBACxC,OAAO,EAAE,CAAA;YAEZ,OAAO,MAAM,CAAC,YAAY,CAAA;QAC5B,CAAC,CAAA;QAED,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAC3C,UAAU,EACV,SAAS,CACV,CAAA;YAED,OAAO,WAAW,CAAA;SACnB;QAED,OAAO,SAAS,EAAE,CAAA;IACpB,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC5B,UAAkB,EAClB,WAAmB;QAEnB,MAAM,IAAI,CAAC,cAAc;aACtB,cAAc,CAAC;YACd,QAAQ,EAAE,UAAU;YACpB,YAAY,EAAE,WAAW;SAC1B,CAAC;aACD,OAAO,EAAE,CAAA;QAEZ,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YAC3D,IAAI,eAAe,EAAE;gBACnB,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;aACpC;YAED,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;SAC9C;IACH,CAAC;CACF;AAED,kBAAe,aAAa,CAAA"}
+{"version":3,"file":"SecretsClient.js","sourceRoot":"","sources":["../../../services/aws/SecretsClient.ts"],"names":[],"mappings":";;AAAA,4EAIwC;AAIxC,MAAM,aAAa;IAGjB,YAAoC,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;QAFhC,mBAAc,GAAG,IAAI,6CAAoB,EAAE,CAAA;IAER,CAAC;IAE9C,KAAK,CAAC,cAAc,CAAC,UAAkB;QAC5C,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;YAC3B,MAAM,OAAO,GAAG,IAAI,8CAAqB,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAA;YAEnE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAEtD,OAAO,MAAM,CAAC,YAAY,CAAA;QAC5B,CAAC,CAAA;QAED,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAC3C,UAAU,EACV,SAAS,CACV,CAAA;YAED,OAAO,WAAW,CAAA;SACnB;QAED,OAAO,SAAS,EAAE,CAAA;IACpB,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC5B,UAAkB,EAClB,WAAmB;QAEnB,MAAM,OAAO,GAAG,IAAI,8CAAqB,CAAC;YACxC,QAAQ,EAAE,UAAU;YACpB,YAAY,EAAE,WAAW;SAC1B,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAEvC,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YAC3D,IAAI,eAAe,EAAE;gBACnB,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;aACpC;YAED,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;SAC9C;IACH,CAAC;CACF;AAED,kBAAe,aAAa,CAAA"}

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

@@ -1,12 +1,14 @@
-import AWS from 'aws-sdk';
+import { DynamoDBDocumentClient, QueryCommandInput, ScanCommandInput } from '@aws-sdk/lib-dynamodb';
 import PaginatedFindResult from './interfaces/PaginatedFindResult';
 declare abstract class BaseDynamoDataStorage<TEntity> {
     protected readonly tableName: string;
     protected abstract readonly keys: Array<keyof TEntity>;
-    protected readonly documentClient: AWS.DynamoDB.DocumentClient;
+    protected readonly documentClient: DynamoDBDocumentClient;
     protected constructor(tableName: string);
-    protected executeOperation<TResultEntity = TEntity>(operation: 'Scan' | 'Query', query: AWS.DynamoDB.DocumentClient.ScanInput): Promise<TResultEntity[]>;
-    protected executePaginatedOperation<TResultEntity = TEntity>(operation: 'Scan' | 'Query', query: AWS.DynamoDB.DocumentClient.ScanInput, lastEvaluatedKey?: string): Promise<PaginatedFindResult<TResultEntity>>;
+    protected executeQuery<TResultEntity = TEntity>(query: QueryCommandInput): Promise<TResultEntity[]>;
+    protected executeScan<TResultEntity = TEntity>(query: ScanCommandInput): Promise<TResultEntity[]>;
+    protected executePaginatedQuery<TResultEntity = TEntity>(query: QueryCommandInput, lastEvaluatedKey?: string): Promise<PaginatedFindResult<TResultEntity>>;
+    protected executePaginatedScan<TResultEntity = TEntity>(query: ScanCommandInput, lastEvaluatedKey?: string): Promise<PaginatedFindResult<TResultEntity>>;
     protected getKeyPairFromModel(model: TEntity): Partial<TEntity>;
 }
 export default BaseDynamoDataStorage;

package/services/aws/dynamodb/BaseDynamoDataStorage.js

@@ -1,28 +1,23 @@
 "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 { DynamoDB } = (0, getAWS_1.default)();
+const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
+const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 class BaseDynamoDataStorage {
     constructor(tableName) {
         this.tableName = tableName;
-        this.documentClient = new DynamoDB.DocumentClient();
+        this.documentClient = lib_dynamodb_1.DynamoDBDocumentClient.from(new client_dynamodb_1.DynamoDBClient());
     }
-    async executeOperation(operation, query) {
+    async executeQuery(query) {
         var _a;
         const results = [];
         let lastEvaluatedKey;
         console.log('DDB Op', query);
         do {
-            const page = operation === 'Scan'
-                ? await this.documentClient
-                    .scan({ ...query, ExclusiveStartKey: lastEvaluatedKey })
-                    .promise()
-                : await this.documentClient
-                    .query({ ...query, ExclusiveStartKey: lastEvaluatedKey })
-                    .promise();
+            const command = new lib_dynamodb_1.QueryCommand({
+                ...query,
+                ExclusiveStartKey: lastEvaluatedKey,
+            });
+            const page = await this.documentClient.send(command);
             if ((_a = page.Items) === null || _a === void 0 ? void 0 : _a.length) {
                 results.push(...page.Items);
             }
@@ -30,39 +25,57 @@ class BaseDynamoDataStorage {
         } while (lastEvaluatedKey);
         return results;
     }
-    async executePaginatedOperation(operation, query, lastEvaluatedKey) {
+    async executeScan(query) {
         var _a;
         const results = [];
+        let lastEvaluatedKey;
         console.log('DDB Op', query);
-        let decodedLastEvaluatedKey;
-        if (lastEvaluatedKey) {
-            decodedLastEvaluatedKey = JSON.parse(Buffer
-                .from(lastEvaluatedKey, 'base64')
-                .toString('utf-8'));
-        }
-        const page = operation === 'Scan'
-            ? await this.documentClient
-                .scan({
-                ...query,
-                ExclusiveStartKey: decodedLastEvaluatedKey,
-            })
-                .promise()
-            : await this.documentClient
-                .query({
+        do {
+            const command = new client_dynamodb_1.ScanCommand({
                 ...query,
-                ExclusiveStartKey: decodedLastEvaluatedKey,
-            })
-                .promise();
-        if ((_a = page.Items) === null || _a === void 0 ? void 0 : _a.length) {
-            results.push(...page.Items);
-        }
-        let newLastEvaluatedKey;
-        if (page.LastEvaluatedKey) {
-            newLastEvaluatedKey = Buffer
-                .from(JSON.stringify(page.LastEvaluatedKey, null, 2), 'utf-8').toString('base64');
-        }
+                ExclusiveStartKey: lastEvaluatedKey,
+            });
+            const page = await this.documentClient.send(command);
+            if ((_a = page.Items) === null || _a === void 0 ? void 0 : _a.length) {
+                results.push(...page.Items);
+            }
+            lastEvaluatedKey = page.LastEvaluatedKey;
+        } while (lastEvaluatedKey);
+        return results;
+    }
+    async executePaginatedQuery(query, lastEvaluatedKey) {
+        const decodedLastEvaluatedKey = lastEvaluatedKey
+            ? JSON.parse(Buffer.from(lastEvaluatedKey, 'base64').toString('utf-8'))
+            : undefined;
+        const command = new lib_dynamodb_1.QueryCommand({
+            ...query,
+            ExclusiveStartKey: decodedLastEvaluatedKey,
+        });
+        const page = await this.documentClient.send(command);
+        const items = page.Items || [];
+        const newLastEvaluatedKey = page.LastEvaluatedKey
+            ? Buffer.from(JSON.stringify(page.LastEvaluatedKey, null, 2), 'utf-8').toString('base64')
+            : undefined;
+        return {
+            items,
+            lastEvaluatedKey: newLastEvaluatedKey,
+        };
+    }
+    async executePaginatedScan(query, lastEvaluatedKey) {
+        const decodedLastEvaluatedKey = lastEvaluatedKey
+            ? JSON.parse(Buffer.from(lastEvaluatedKey, 'base64').toString('utf-8'))
+            : undefined;
+        const command = new client_dynamodb_1.ScanCommand({
+            ...query,
+            ExclusiveStartKey: decodedLastEvaluatedKey,
+        });
+        const page = await this.documentClient.send(command);
+        const items = page.Items || [];
+        const newLastEvaluatedKey = page.LastEvaluatedKey
+            ? Buffer.from(JSON.stringify(page.LastEvaluatedKey, null, 2), 'utf-8').toString('base64')
+            : undefined;
         return {
-            items: results,
+            items,
             lastEvaluatedKey: newLastEvaluatedKey,
         };
     }

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

@@ -1 +1 @@
-{"version":3,"file":"BaseDynamoDataStorage.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/BaseDynamoDataStorage.ts"],"names":[],"mappings":";;;;;AAIA,mEAA0C;AAE1C,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAA;AAE7B,MAAe,qBAAqB;IAKlC,YAAyC,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;QACxD,IAAI,CAAC,cAAc,GAAG,IAAI,QAAQ,CAAC,cAAc,EAAE,CAAA;IACrD,CAAC;IAES,KAAK,CAAC,gBAAgB,CAC9B,SAA2B,EAC3B,KAA4C;;QAE5C,MAAM,OAAO,GAAG,EAAE,CAAA;QAClB,IAAI,gBAAgB,CAAA;QAEpB,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QAE5B,GAAG;YACD,MAAM,IAAI,GACR,SAAS,KAAK,MAAM;gBAClB,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc;qBACtB,IAAI,CAAC,EAAE,GAAG,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;qBACvD,OAAO,EAAE;gBACd,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc;qBACtB,KAAK,CAAC,EAAE,GAAG,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;qBACxD,OAAO,EAAE,CAAA;YAElB,IAAI,MAAA,IAAI,CAAC,KAAK,0CAAE,MAAM,EAAE;gBACtB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;aAC5B;YAED,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAA;SACzC,QAAQ,gBAAgB,EAAC;QAE1B,OAAO,OAA0B,CAAA;IACnC,CAAC;IAES,KAAK,CAAC,yBAAyB,CACvC,SAA2B,EAC3B,KAA4C,EAC5C,gBAAyB;;QAEzB,MAAM,OAAO,GAAG,EAAE,CAAA;QAClB,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QAC5B,IAAI,uBAAqD,CAAA;QAEzD,IAAI,gBAAgB,EAAE;YACpB,uBAAuB,GAAG,IAAI,CAAC,KAAK,CAClC,MAAM;iBACH,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC;iBAChC,QAAQ,CAAC,OAAO,CAAC,CACrB,CAAA;SACF;QAED,MAAM,IAAI,GACR,SAAS,KAAK,MAAM;YAClB,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc;iBACxB,IAAI,CAAC;gBACJ,GAAG,KAAK;gBACR,iBAAiB,EAAE,uBAAuB;aAC3C,CAAC;iBACD,OAAO,EAAE;YACZ,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc;iBACxB,KAAK,CAAC;gBACL,GAAG,KAAK;gBACR,iBAAiB,EAAE,uBAAuB;aAC3C,CAAC;iBACD,OAAO,EAAE,CAAA;QAEhB,IAAI,MAAA,IAAI,CAAC,KAAK,0CAAE,MAAM,EAAE;YACtB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;SAC5B;QAED,IAAI,mBAAuC,CAAA;QAC3C,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,mBAAmB,GAAG,MAAM;iBACzB,IAAI,CACH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,EAC9C,OAAO,CACR,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;SACvB;QAED,OAAO;YACL,KAAK,EAAE,OAA0B;YACjC,gBAAgB,EAAE,mBAAmB;SACtC,CAAA;IACH,CAAC;IAES,mBAAmB,CAAC,KAAc;QAC1C,MAAM,aAAa,GAAqB,EAAE,CAAA;QAE1C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,aAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QAEF,OAAO,aAAa,CAAA;IACtB,CAAC;CACF;AAED,kBAAe,qBAAqB,CAAA"}
+{"version":3,"file":"BaseDynamoDataStorage.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/BaseDynamoDataStorage.ts"],"names":[],"mappings":"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"}

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

@@ -1,15 +1,17 @@
-import { DynamoDB } from 'aws-sdk';
 import { PrimaryKey, QueryParameters } from './utils';
 import BaseDynamoDataStorage from './BaseDynamoDataStorage';
-import DataStorage from './interfaces/DataStorage';
 import PaginatedFindResult from './interfaces/PaginatedFindResult';
-declare abstract class DynamoDataStorage<TEntity> extends BaseDynamoDataStorage<TEntity> implements DataStorage<TEntity> {
+import WriteRequest from './types/WriteRequest';
+import QueryableDataStorage from './interfaces/QueryableDataStorage';
+declare abstract class DynamoDataStorage<TEntity> extends BaseDynamoDataStorage<TEntity> implements QueryableDataStorage<TEntity> {
     protected constructor(tableName: string);
-    protected batchWriteRequest(writeRequests: DynamoDB.DocumentClient.WriteRequests, batchSize?: number): Promise<void>;
+    protected batchWriteRequest(writeRequests: WriteRequest[], batchSize?: number): Promise<void>;
     get(key: PrimaryKey<TEntity>): Promise<TEntity | null>;
     batchGet(keys: PrimaryKey<TEntity>[], batchSize?: number): Promise<TEntity[]>;
-    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[]>;
+    scan<TResultEntity = TEntity>(query: QueryParameters<TEntity>): Promise<TResultEntity[]>;
+    queryForPage<TResultEntity = TEntity>(query: QueryParameters<TEntity>, lastEvaluatedKey?: string): Promise<PaginatedFindResult<TResultEntity>>;
+    scanForPage<TResultEntity = TEntity>(query: QueryParameters<TEntity>, lastEvaluatedKey?: string): Promise<PaginatedFindResult<TResultEntity>>;
     findOne(query: Omit<QueryParameters<TEntity>, 'limit'>): Promise<TEntity | null>;
     remove(entity: Partial<TEntity>): Promise<void>;
     batchRemove(entities: Partial<TEntity>[], batchSize?: number): Promise<void>;

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;
     }
 }