@trunkrs/common 1.5.5 → 1.5.9

package/models/email/Attachment.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="node" />
+import { MimeType } from '../enum';
+interface Attachment {
+    fileName: string;
+    data: Buffer;
+    mimeType: MimeType;
+}
+export default Attachment;

package/models/email/Attachment.js

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

package/models/email/Attachment.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Attachment.js","sourceRoot":"","sources":["../../../models/email/Attachment.ts"],"names":[],"mappings":""}

package/models/email/EmailContent.d.ts

@@ -0,0 +1,6 @@
+interface EmailContent {
+    html?: string;
+    text?: string;
+    subject?: string;
+}
+export default EmailContent;

package/models/email/EmailContent.js

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

package/models/email/EmailContent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EmailContent.js","sourceRoot":"","sources":["../../../models/email/EmailContent.ts"],"names":[],"mappings":""}

package/models/email/Template.d.ts

@@ -0,0 +1,7 @@
+interface Template {
+    name: string;
+    subject?: string;
+    html?: string;
+    text?: string;
+}
+export default Template;

package/models/email/Template.js

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

package/models/email/Template.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Template.js","sourceRoot":"","sources":["../../../models/email/Template.ts"],"names":[],"mappings":""}

package/models/email/index.d.ts

@@ -0,0 +1,3 @@
+export { default as Attachment } from './Attachment';
+export { default as EmailContent } from './EmailContent';
+export { default as Template } from './Template';

package/models/email/index.js

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

package/models/email/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../models/email/index.ts"],"names":[],"mappings":""}

package/models/enum/Environment.d.ts

@@ -0,0 +1,6 @@
+declare enum Environment {
+    Dev = "dev",
+    QA = "qa",
+    Prod = "prod"
+}
+export default Environment;

package/models/enum/Environment.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var Environment;
+(function (Environment) {
+    Environment["Dev"] = "dev";
+    Environment["QA"] = "qa";
+    Environment["Prod"] = "prod";
+})(Environment || (Environment = {}));
+exports.default = Environment;
+//# sourceMappingURL=Environment.js.map

package/models/enum/Environment.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Environment.js","sourceRoot":"","sources":["../../../models/enum/Environment.ts"],"names":[],"mappings":";;AAAA,IAAK,WAIJ;AAJD,WAAK,WAAW;IACd,0BAAW,CAAA;IACX,wBAAS,CAAA;IACT,4BAAa,CAAA;AACf,CAAC,EAJI,WAAW,KAAX,WAAW,QAIf;AAED,kBAAe,WAAW,CAAA"}

package/models/errors/email/EmailValidationError.d.ts

@@ -0,0 +1,5 @@
+import ErrorBase from '../ErrorBase';
+declare class EmailValidationError extends ErrorBase {
+    constructor();
+}
+export default EmailValidationError;

package/models/errors/email/EmailValidationError.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ErrorBase_1 = __importDefault(require("../ErrorBase"));
+class EmailValidationError extends ErrorBase_1.default {
+    constructor() {
+        super();
+        this.message = `Email is either missing a subject and/or a body, or recipient/s are from an invalid domain.`;
+    }
+}
+exports.default = EmailValidationError;
+//# sourceMappingURL=EmailValidationError.js.map

package/models/errors/email/EmailValidationError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EmailValidationError.js","sourceRoot":"","sources":["../../../../models/errors/email/EmailValidationError.ts"],"names":[],"mappings":";;;;;AAAA,6DAAoC;AAEpC,MAAM,oBAAqB,SAAQ,mBAAS;IAC1C;QACE,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO,GAAG,6FAA6F,CAAA;IAC9G,CAAC;CACF;AAED,kBAAe,oBAAoB,CAAA"}

package/models/errors/email/TemplateNotFoundError.d.ts

@@ -0,0 +1,5 @@
+import ErrorBase from '../ErrorBase';
+declare class TemplateNotFoundError extends ErrorBase {
+    constructor(identifier: string);
+}
+export default TemplateNotFoundError;

package/models/errors/email/TemplateNotFoundError.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ErrorBase_1 = __importDefault(require("../ErrorBase"));
+class TemplateNotFoundError extends ErrorBase_1.default {
+    constructor(identifier) {
+        super();
+        this.message = `The template: ${identifier} could not be found.`;
+    }
+}
+exports.default = TemplateNotFoundError;
+//# sourceMappingURL=TemplateNotFoundError.js.map

package/models/errors/email/TemplateNotFoundError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TemplateNotFoundError.js","sourceRoot":"","sources":["../../../../models/errors/email/TemplateNotFoundError.ts"],"names":[],"mappings":";;;;;AAAA,6DAAoC;AAEpC,MAAM,qBAAsB,SAAQ,mBAAS;IAC3C,YAAmB,UAAkB;QACnC,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO,GAAG,iBAAiB,UAAU,sBAAsB,CAAA;IAClE,CAAC;CACF;AAED,kBAAe,qBAAqB,CAAA"}

package/models/errors/email/index.d.ts

@@ -0,0 +1,2 @@
+export { default as NoEmailBodyError } from './EmailValidationError';
+export { default as TemplateNotFoundError } from './TemplateNotFoundError';

package/models/errors/email/index.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TemplateNotFoundError = exports.NoEmailBodyError = void 0;
+var EmailValidationError_1 = require("./EmailValidationError");
+Object.defineProperty(exports, "NoEmailBodyError", { enumerable: true, get: function () { return __importDefault(EmailValidationError_1).default; } });
+var TemplateNotFoundError_1 = require("./TemplateNotFoundError");
+Object.defineProperty(exports, "TemplateNotFoundError", { enumerable: true, get: function () { return __importDefault(TemplateNotFoundError_1).default; } });
+//# sourceMappingURL=index.js.map

package/models/errors/email/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../models/errors/email/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAoE;AAA3D,yIAAA,OAAO,OAAoB;AACpC,iEAA0E;AAAjE,+IAAA,OAAO,OAAyB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trunkrs/common",
-  "version": "1.5.5",
+  "version": "1.5.9",
   "description": "Common standards library for development in Trunkrs",
   "types": "./index.d.ts",
   "repository": "https://github.com/Trunkrs/common.git",
@@ -17,16 +17,17 @@
     "@types/jest": "^27.0.1",
     "@types/joi": "^17.2.3",
     "@types/node": "^14.11.2",
+    "@types/nodemailer": "^6.4.4",
     "@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",
-    "eslint-config-airbnb-base-typescript-prettier": "^3.1.1",
-    "eslint-config-airbnb-typescript-prettier": "^4.1.0",
     "aws-lambda": "^1.0.6",
     "concurrently": "^6.2.1",
     "eslint": "^7.10.0",
+    "eslint-config-airbnb-base-typescript-prettier": "^3.1.1",
+    "eslint-config-airbnb-typescript-prettier": "^4.1.0",
     "faker": "^5.5.3",
     "husky": "^4.3.0",
     "jest": "^27.0.5",

package/providers/auth0.js

@@ -34,6 +34,7 @@ exports.Auth0MachineTokenClient = service_provider_1.default.createSymbol('Auth0
 const configureAuth0Service = (baseUrl, appClientSecretName, tokenCacheStoreName, tokenCacheMountPath) => {
     const serviceProvider = new service_provider_1.default((0, caching_1.configureDailyTokenCache)(tokenCacheStoreName, tokenCacheMountPath));
     serviceProvider.register(exports.Auth0MachineTokenClient, service_provider_1.Lifecycle.Singleton, () => new client_1.MachineTokenClient(appClientSecretName, aws_1.default.provide(aws_2.SecretsClient), utils_1.default.provide(client_1.OAuthClient), utils_1.default.provide(utils_1.Serializer)));
+    utils_1.default.provide(utils_1.Logger);
     serviceProvider.register(exports.Auth0MachineClient, service_provider_1.Lifecycle.Singleton, () => new client_1.MachineClient(serviceProvider.provide(exports.Auth0MachineTokenClient), utils_1.default.provide(utils_1.HttpClient), serviceProvider.provide(caching_1.DailyTokenCache), appClientSecretName, baseUrl));
     return serviceProvider;
 };

package/providers/auth0.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth0.js","sourceRoot":"","sources":["../../providers/auth0.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8EAAsE;AAEtE,+CAI2B;AAC3B,iDAA+D;AAE/D,uCAAqE;AACrE,gDAA+B;AAC/B,yCAA+C;AAElC,QAAA,kBAAkB,GAC7B,0BAAe,CAAC,YAAY,CAAgB,oBAAoB,CAAC,CAAA;AAEtD,QAAA,uBAAuB,GAClC,0BAAe,CAAC,YAAY,CAAqB,yBAAyB,CAAC,CAAA;AAStE,MAAM,qBAAqB,GAAG,CACnC,OAAe,EACf,mBAA2B,EAC3B,mBAA2B,EAC3B,mBAA2B,EACV,EAAE;IACnB,MAAM,eAAe,GAAG,IAAI,0BAAe,CACzC,IAAA,kCAAwB,EAAC,mBAAmB,EAAE,mBAAmB,CAAC,CACnE,CAAA;IAED,eAAe,CAAC,QAAQ,CACtB,+BAAuB,EACvB,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,2BAAkB,CACpB,mBAAmB,EACnB,aAAW,CAAC,OAAO,CAAC,mBAAa,CAAC,EAClC,eAAa,CAAC,OAAO,CAAC,oBAAW,CAAC,EAClC,eAAa,CAAC,OAAO,CAAC,kBAAU,CAAC,CAClC,CACJ,CAAA;IAED,eAAe,CAAC,QAAQ,CACtB,0BAAkB,EAClB,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,sBAAa,CACf,eAAe,CAAC,OAAO,CAAC,+BAAuB,CAAC,EAChD,eAAa,CAAC,OAAO,CAAC,kBAAU,CAAC,EACjC,eAAe,CAAC,OAAO,CAAC,yBAAe,CAAC,EACxC,mBAAmB,EACnB,OAAO,CACR,CACJ,CAAA;IAED,OAAO,eAAe,CAAA;AACxB,CAAC,CAAA;AApCY,QAAA,qBAAqB,yBAoCjC"}
+{"version":3,"file":"auth0.js","sourceRoot":"","sources":["../../providers/auth0.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8EAAsE;AAEtE,+CAI2B;AAC3B,iDAAuE;AAEvE,uCAAqE;AACrE,gDAA+B;AAC/B,yCAA+C;AAElC,QAAA,kBAAkB,GAC7B,0BAAe,CAAC,YAAY,CAAgB,oBAAoB,CAAC,CAAA;AAEtD,QAAA,uBAAuB,GAClC,0BAAe,CAAC,YAAY,CAAqB,yBAAyB,CAAC,CAAA;AAStE,MAAM,qBAAqB,GAAG,CACnC,OAAe,EACf,mBAA2B,EAC3B,mBAA2B,EAC3B,mBAA2B,EACV,EAAE;IACnB,MAAM,eAAe,GAAG,IAAI,0BAAe,CACzC,IAAA,kCAAwB,EAAC,mBAAmB,EAAE,mBAAmB,CAAC,CACnE,CAAA;IAED,eAAe,CAAC,QAAQ,CACtB,+BAAuB,EACvB,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,2BAAkB,CACpB,mBAAmB,EACnB,aAAW,CAAC,OAAO,CAAC,mBAAa,CAAC,EAClC,eAAa,CAAC,OAAO,CAAC,oBAAW,CAAC,EAClC,eAAa,CAAC,OAAO,CAAC,kBAAU,CAAC,CAClC,CACJ,CAAA;IAED,eAAa,CAAC,OAAO,CAAC,cAAM,CAAC,CAAA;IAE7B,eAAe,CAAC,QAAQ,CACtB,0BAAkB,EAClB,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,sBAAa,CACf,eAAe,CAAC,OAAO,CAAC,+BAAuB,CAAC,EAChD,eAAa,CAAC,OAAO,CAAC,kBAAU,CAAC,EACjC,eAAe,CAAC,OAAO,CAAC,yBAAe,CAAC,EACxC,mBAAmB,EACnB,OAAO,CACR,CACJ,CAAA;IAED,OAAO,eAAe,CAAA;AACxB,CAAC,CAAA;AAtCY,QAAA,qBAAqB,yBAsCjC"}

package/providers/aws.js.map

@@ -1 +1 @@
-{"version":3,"file":"aws.js","sourceRoot":"","sources":["../../providers/aws.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,8EAAsE;AAEtE,kFAAyD;AACzD,8CAA8C;AAE9C,oDAAmC;AAEnC,MAAM,WAAW,GAAG,IAAI,0BAAe,EAAE,CAAA;AAEzC,WAAW,CAAC,QAAQ,CAClB,uBAAa,EACb,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CAAC,IAAI,uBAAa,CAAC,eAAa,CAAC,OAAO,CAAC,qBAAW,CAAC,CAAC,CAC5D,CAAA;AAED,kBAAe,WAAW,CAAA"}
+{"version":3,"file":"aws.js","sourceRoot":"","sources":["../../providers/aws.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AACA,8EAAsE;AAEtE,kFAAyD;AACzD,8CAA8C;AAE9C,oDAAmC;AAEnC,MAAM,WAAW,GAAG,IAAI,0BAAe,EAAE,CAAA;AAEzC,WAAW,CAAC,QAAQ,CAClB,uBAAa,EACb,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CAAC,IAAI,uBAAa,CAAC,eAAa,CAAC,OAAO,CAAC,qBAAW,CAAC,CAAC,CAC5D,CAAA;AAED,kBAAe,WAAW,CAAA"}

package/providers/email.d.ts

@@ -0,0 +1,17 @@
+import ServiceProvider from '../utils/service-provider';
+import { RecipientValidationConfig } from '../services/email/EmailClient/models';
+import Environment from '../models/enum/Environment';
+export interface ConfigureEmailClientsRequest {
+    from: string;
+    templateCacheMountPath: string;
+    sesRegion: string;
+    stage: Environment;
+    requireBody?: boolean;
+    requireSubject?: boolean;
+    sourceArn?: string;
+    validateRecipientDomains?: RecipientValidationConfig;
+}
+export declare const NodemailerClient: symbol;
+export declare const SesNodemailerClient: symbol;
+export declare const TemplateFileCache: symbol;
+export declare const configureEmailClients: (request: ConfigureEmailClientsRequest) => ServiceProvider;

package/providers/email.js

@@ -0,0 +1,59 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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;
+const nodemailer_1 = require("nodemailer");
+const aws_sdk_1 = require("aws-sdk");
+const service_provider_1 = __importStar(require("../utils/service-provider"));
+const aws_1 = __importDefault(require("./aws"));
+const email_1 = require("../services/email");
+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.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),
+    }));
+    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({
+        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(exports.SesNodemailerClient, service_provider_1.Lifecycle.Singleton, () => new email_1.NodemailerEmailClient({
+        mailer: serviceProvider.provide(exports.NodemailerClient),
+        templateClient: serviceProvider.provide(email_1.SESTemplateClient),
+        stage: request.stage,
+        from: request.from,
+        requireBody: request.requireBody || true,
+        requireSubject: request.requireSubject || true,
+        sourceArn: request.sourceArn,
+        validateRecipientDomains: request.validateRecipientDomains,
+    }));
+    return serviceProvider;
+};
+exports.configureEmailClients = configureEmailClients;
+//# sourceMappingURL=email.js.map

package/providers/email.js.map

@@ -0,0 +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"}

package/services/aws/dynamodb/DynamoDataStorage.js

@@ -90,7 +90,7 @@ class DynamoDataStorage extends BaseDynamoDataStorage_1.default {
             .promise();
     }
     async batchRemove(entities, batchSize = 24) {
-        const keyPairs = entities.map(this.getKeyPairFromModel);
+        const keyPairs = entities.map((entity) => this.getKeyPairFromModel(entity));
         const items = keyPairs.map((keyPair) => ({
             DeleteRequest: {
                 Key: keyPair,

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/Operators.d.ts

@@ -1,4 +1,5 @@
-import { BeginsWith, Between, Contains, GreaterThan, GreaterThanOrEquals, In, LesserThan, LesserThanOrEquals, NotEquals } from './utils/operators';
+import { BeginsWith, Between, Contains, GreaterThan, GreaterThanOrEquals, In, LesserThan, LesserThanOrEquals, NotEquals, And, Or, Exists, NotExists } from './utils/operators';
+import DynamoOperator from './utils/operators/DynamoOperator';
 declare class Operators {
     static beginsWith(startValue: string): BeginsWith;
     static between(valueStart: number, valueEnd: number): Between;
@@ -9,5 +10,9 @@ declare class Operators {
     static lesserThan(numberToMaintain: number | string): LesserThan;
     static lesserThanOrEquals(valueToMaintainOrMatch: number | string): LesserThanOrEquals;
     static notEquals(valueToExclude: number | string): NotEquals;
+    static and(...innerOperators: DynamoOperator[]): And;
+    static or(...innerOperators: DynamoOperator[]): Or;
+    static exists(): Exists;
+    static notExists(): NotExists;
 }
 export default Operators;

package/services/aws/dynamodb/Operators.js

@@ -29,6 +29,18 @@ class Operators {
     static notEquals(valueToExclude) {
         return operators_1.NotEquals.fromValue(valueToExclude);
     }
+    static and(...innerOperators) {
+        return new operators_1.And(innerOperators);
+    }
+    static or(...innerOperators) {
+        return new operators_1.Or(innerOperators);
+    }
+    static exists() {
+        return new operators_1.Exists();
+    }
+    static notExists() {
+        return new operators_1.NotExists();
+    }
 }
 exports.default = Operators;
 //# sourceMappingURL=Operators.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Operators.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/Operators.ts"],"names":[],"mappings":";;AAAA,iDAU0B;AAE1B,MAAM,SAAS;IACN,MAAM,CAAC,UAAU,CAAC,UAAkB;QACzC,OAAO,sBAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;IACzC,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,UAAkB,EAAE,QAAgB;QACxD,OAAO,mBAAO,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,YAAoB;QACzC,OAAO,oBAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;IACzC,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,cAA+B;QACvD,OAAO,uBAAW,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;IAC9C,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAC/B,oBAAqC;QAErC,OAAO,+BAAmB,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAA;IAC5D,CAAC;IAEM,MAAM,CAAC,EAAE,CAAC,MAA8B;QAC7C,OAAO,cAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAC7B,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,gBAAiC;QACxD,OAAO,sBAAU,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;IAC/C,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAC9B,sBAAuC;QAEvC,OAAO,8BAAkB,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAA;IAC7D,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,cAA+B;QACrD,OAAO,qBAAS,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;IAC5C,CAAC;CACF;AAED,kBAAe,SAAS,CAAA"}
+{"version":3,"file":"Operators.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/Operators.ts"],"names":[],"mappings":";;AAAA,iDAc0B;AAG1B,MAAM,SAAS;IACN,MAAM,CAAC,UAAU,CAAC,UAAkB;QACzC,OAAO,sBAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;IACzC,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,UAAkB,EAAE,QAAgB;QACxD,OAAO,mBAAO,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,YAAoB;QACzC,OAAO,oBAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;IACzC,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,cAA+B;QACvD,OAAO,uBAAW,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;IAC9C,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAC/B,oBAAqC;QAErC,OAAO,+BAAmB,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAA;IAC5D,CAAC;IAEM,MAAM,CAAC,EAAE,CAAC,MAA8B;QAC7C,OAAO,cAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAC7B,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,gBAAiC;QACxD,OAAO,sBAAU,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;IAC/C,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAC9B,sBAAuC;QAEvC,OAAO,8BAAkB,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAA;IAC7D,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,cAA+B;QACrD,OAAO,qBAAS,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;IAC5C,CAAC;IAEM,MAAM,CAAC,GAAG,CAAC,GAAG,cAAgC;QACnD,OAAO,IAAI,eAAG,CAAC,cAAc,CAAC,CAAA;IAChC,CAAC;IAEM,MAAM,CAAC,EAAE,CAAC,GAAG,cAAgC;QAClD,OAAO,IAAI,cAAE,CAAC,cAAc,CAAC,CAAA;IAC/B,CAAC;IAEM,MAAM,CAAC,MAAM;QAClB,OAAO,IAAI,kBAAM,EAAE,CAAA;IACrB,CAAC;IAEM,MAAM,CAAC,SAAS;QACrB,OAAO,IAAI,qBAAS,EAAE,CAAA;IACxB,CAAC;CACF;AAED,kBAAe,SAAS,CAAA"}

package/services/aws/dynamodb/utils/operators/And.d.ts

@@ -0,0 +1,7 @@
+import DynamoOperator from './DynamoOperator';
+declare class And extends DynamoOperator {
+    private readonly innerOperators;
+    constructor(innerOperators: DynamoOperator[]);
+    render(attributeName: string): string;
+}
+export default And;

package/services/aws/dynamodb/utils/operators/And.js

@@ -0,0 +1,25 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const DynamoOperator_1 = __importDefault(require("./DynamoOperator"));
+class And extends DynamoOperator_1.default {
+    constructor(innerOperators) {
+        super(innerOperators.flatMap((op) => op.attributeValues));
+        this.innerOperators = innerOperators;
+    }
+    render(attributeName) {
+        let offset = 0;
+        const clauseBody = this.innerOperators
+            .map((operator) => {
+            const result = operator.render(attributeName, offset);
+            offset += operator.attributeValues.length;
+            return result;
+        })
+            .join(' AND ');
+        return `(${clauseBody})`;
+    }
+}
+exports.default = And;
+//# sourceMappingURL=And.js.map

package/services/aws/dynamodb/utils/operators/And.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"And.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/And.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,GAAI,SAAQ,wBAAc;IAC9B,YAAoC,cAAgC;QAClE,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAA;QADvB,mBAAc,GAAd,cAAc,CAAkB;IAEpE,CAAC;IAED,MAAM,CAAC,aAAqB;QAC1B,IAAI,MAAM,GAAG,CAAC,CAAA;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc;aACnC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;YACrD,MAAM,IAAI,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAA;YAEzC,OAAO,MAAM,CAAA;QACf,CAAC,CAAC;aACD,IAAI,CAAC,OAAO,CAAC,CAAA;QAEhB,OAAO,IAAI,UAAU,GAAG,CAAA;IAC1B,CAAC;CACF;AAED,kBAAe,GAAG,CAAA"}

package/services/aws/dynamodb/utils/operators/BeginsWith.d.ts

@@ -1,7 +1,7 @@
 import DynamoOperator from './DynamoOperator';
 declare class BeginsWith extends DynamoOperator<string> {
     constructor(startValue: string);
-    render(attributeName: string): string;
+    render(attributeName: string, paramOffset?: number): string;
     static fromValue(startValue: string): BeginsWith;
 }
 export default BeginsWith;

package/services/aws/dynamodb/utils/operators/BeginsWith.js

@@ -8,8 +8,9 @@ class BeginsWith extends DynamoOperator_1.default {
     constructor(startValue) {
         super([startValue]);
     }
-    render(attributeName) {
-        return `begins_with(#${attributeName}, ${this.makeAttrValueName(attributeName, 0)})`;
+    render(attributeName, paramOffset) {
+        const actualOffset = paramOffset !== null && paramOffset !== void 0 ? paramOffset : 0;
+        return `begins_with(#${attributeName}, ${this.makeAttrValueName(attributeName, actualOffset)})`;
     }
     static fromValue(startValue) {
         return new BeginsWith(startValue);

package/services/aws/dynamodb/utils/operators/BeginsWith.js.map

@@ -1 +1 @@
-{"version":3,"file":"BeginsWith.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/BeginsWith.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,UAAW,SAAQ,wBAAsB;IAC7C,YAAmB,UAAkB;QACnC,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA;IACrB,CAAC;IAEM,MAAM,CAAC,aAAqB;QACjC,OAAO,gBAAgB,aAAa,KAAK,IAAI,CAAC,iBAAiB,CAC7D,aAAa,EACb,CAAC,CACF,GAAG,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,UAAkB;QACxC,OAAO,IAAI,UAAU,CAAC,UAAU,CAAC,CAAA;IACnC,CAAC;CACF;AAED,kBAAe,UAAU,CAAA"}
+{"version":3,"file":"BeginsWith.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/BeginsWith.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,UAAW,SAAQ,wBAAsB;IAC7C,YAAmB,UAAkB;QACnC,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA;IACrB,CAAC;IAEM,MAAM,CAAC,aAAqB,EAAE,WAAoB;QACvD,MAAM,YAAY,GAAG,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,CAAC,CAAA;QAErC,OAAO,gBAAgB,aAAa,KAAK,IAAI,CAAC,iBAAiB,CAC7D,aAAa,EACb,YAAY,CACb,GAAG,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,UAAkB;QACxC,OAAO,IAAI,UAAU,CAAC,UAAU,CAAC,CAAA;IACnC,CAAC;CACF;AAED,kBAAe,UAAU,CAAA"}

package/services/aws/dynamodb/utils/operators/Between.d.ts

@@ -1,7 +1,7 @@
 import DynamoOperator from './DynamoOperator';
 declare class Between extends DynamoOperator<number> {
     constructor(valueStart: number, valueEnd: number);
-    render(attributeName: string): string;
+    render(attributeName: string, paramOffset?: number): string;
     static fromValue(valueStart: number, valueEnd: number): Between;
 }
 export default Between;

package/services/aws/dynamodb/utils/operators/Between.js

@@ -8,8 +8,9 @@ class Between extends DynamoOperator_1.default {
     constructor(valueStart, valueEnd) {
         super([valueStart, valueEnd]);
     }
-    render(attributeName) {
-        return `#${attributeName} BETWEEN ${this.makeAttrValueName(attributeName, 0)} AND ${this.makeAttrValueName(attributeName, 1)}`;
+    render(attributeName, paramOffset) {
+        const actualOffset = paramOffset !== null && paramOffset !== void 0 ? paramOffset : 0;
+        return `#${attributeName} BETWEEN ${this.makeAttrValueName(attributeName, actualOffset)} AND ${this.makeAttrValueName(attributeName, 1)}`;
     }
     static fromValue(valueStart, valueEnd) {
         return new Between(valueStart, valueEnd);

package/services/aws/dynamodb/utils/operators/Between.js.map

@@ -1 +1 @@
-{"version":3,"file":"Between.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/Between.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,OAAQ,SAAQ,wBAAsB;IAC1C,YAAmB,UAAkB,EAAE,QAAgB;QACrD,KAAK,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAA;IAC/B,CAAC;IAED,MAAM,CAAC,aAAqB;QAC1B,OAAO,IAAI,aAAa,YAAY,IAAI,CAAC,iBAAiB,CACxD,aAAa,EACb,CAAC,CACF,QAAQ,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,CAAA;IACrD,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,UAAkB,EAAE,QAAgB;QAC1D,OAAO,IAAI,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAC1C,CAAC;CACF;AAED,kBAAe,OAAO,CAAA"}
+{"version":3,"file":"Between.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/Between.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,OAAQ,SAAQ,wBAAsB;IAC1C,YAAmB,UAAkB,EAAE,QAAgB;QACrD,KAAK,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAA;IAC/B,CAAC;IAED,MAAM,CAAC,aAAqB,EAAE,WAAoB;QAChD,MAAM,YAAY,GAAG,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,CAAC,CAAA;QAErC,OAAO,IAAI,aAAa,YAAY,IAAI,CAAC,iBAAiB,CACxD,aAAa,EACb,YAAY,CACb,QAAQ,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,CAAA;IACrD,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,UAAkB,EAAE,QAAgB;QAC1D,OAAO,IAAI,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAC1C,CAAC;CACF;AAED,kBAAe,OAAO,CAAA"}

package/services/aws/dynamodb/utils/operators/Contains.d.ts

@@ -1,7 +1,7 @@
 import DynamoOperator from './DynamoOperator';
 declare class Contains extends DynamoOperator<string> {
     constructor(partialValue: string);
-    render(attributeName: string): string;
+    render(attributeName: string, paramOffset?: number): string;
     static fromValue(partialValue: string): Contains;
 }
 export default Contains;

package/services/aws/dynamodb/utils/operators/Contains.js

@@ -8,8 +8,9 @@ class Contains extends DynamoOperator_1.default {
     constructor(partialValue) {
         super([partialValue]);
     }
-    render(attributeName) {
-        return `contains(#${attributeName}, ${this.makeAttrValueName(attributeName, 0)})`;
+    render(attributeName, paramOffset) {
+        const actualOffset = paramOffset !== null && paramOffset !== void 0 ? paramOffset : 0;
+        return `contains(#${attributeName}, ${this.makeAttrValueName(attributeName, actualOffset)})`;
     }
     static fromValue(partialValue) {
         return new Contains(partialValue);

package/services/aws/dynamodb/utils/operators/Contains.js.map

@@ -1 +1 @@
-{"version":3,"file":"Contains.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/Contains.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,QAAS,SAAQ,wBAAsB;IAC3C,YAAmB,YAAoB;QACrC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAA;IACvB,CAAC;IAEM,MAAM,CAAC,aAAqB;QACjC,OAAO,aAAa,aAAa,KAAK,IAAI,CAAC,iBAAiB,CAC1D,aAAa,EACb,CAAC,CACF,GAAG,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,YAAoB;QAC1C,OAAO,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAA;IACnC,CAAC;CACF;AAED,kBAAe,QAAQ,CAAA"}
+{"version":3,"file":"Contains.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/Contains.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,QAAS,SAAQ,wBAAsB;IAC3C,YAAmB,YAAoB;QACrC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAA;IACvB,CAAC;IAEM,MAAM,CAAC,aAAqB,EAAE,WAAoB;QACvD,MAAM,YAAY,GAAG,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,CAAC,CAAA;QAErC,OAAO,aAAa,aAAa,KAAK,IAAI,CAAC,iBAAiB,CAC1D,aAAa,EACb,YAAY,CACb,GAAG,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,YAAoB;QAC1C,OAAO,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAA;IACnC,CAAC;CACF;AAED,kBAAe,QAAQ,CAAA"}

package/services/aws/dynamodb/utils/operators/DynamoOperator.d.ts

@@ -2,6 +2,6 @@ declare abstract class DynamoOperator<TValue = any> {
     readonly attributeValues: TValue[];
     protected constructor(attributeValues: TValue[]);
     makeAttrValueName(attributeName: string, index: number): string;
-    abstract render(attributeName: string): string;
+    abstract render(attributeName: string, paramOffset?: number): string;
 }
 export default DynamoOperator;

package/services/aws/dynamodb/utils/operators/DynamoOperator.js.map

@@ -1 +1 @@
-{"version":3,"file":"DynamoOperator.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/DynamoOperator.ts"],"names":[],"mappings":";;AAAA,MAAe,cAAc;IAC3B,YAIkB,eAAyB;QAAzB,oBAAe,GAAf,eAAe,CAAU;IACxC,CAAC;IAOG,iBAAiB,CAAC,aAAqB,EAAE,KAAa;QAC3D,OAAO,IAAI,aAAa,IAAI,KAAK,EAAE,CAAA;IACrC,CAAC;CAOF;AAED,kBAAe,cAAc,CAAA"}
+{"version":3,"file":"DynamoOperator.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/DynamoOperator.ts"],"names":[],"mappings":";;AAAA,MAAe,cAAc;IAC3B,YAIkB,eAAyB;QAAzB,oBAAe,GAAf,eAAe,CAAU;IACxC,CAAC;IAOG,iBAAiB,CAAC,aAAqB,EAAE,KAAa;QAC3D,OAAO,IAAI,aAAa,IAAI,KAAK,EAAE,CAAA;IACrC,CAAC;CAQF;AAED,kBAAe,cAAc,CAAA"}

package/services/aws/dynamodb/utils/operators/Exists.d.ts

@@ -0,0 +1,6 @@
+import DynamoOperator from './DynamoOperator';
+declare class Exists extends DynamoOperator {
+    constructor();
+    render(attributeName: string): string;
+}
+export default Exists;

package/services/aws/dynamodb/utils/operators/Exists.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const DynamoOperator_1 = __importDefault(require("./DynamoOperator"));
+class Exists extends DynamoOperator_1.default {
+    constructor() {
+        super([]);
+    }
+    render(attributeName) {
+        return `attribute_exists(#${attributeName})`;
+    }
+}
+exports.default = Exists;
+//# sourceMappingURL=Exists.js.map

package/services/aws/dynamodb/utils/operators/Exists.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Exists.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/Exists.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,MAAO,SAAQ,wBAAc;IACjC;QACE,KAAK,CAAC,EAAE,CAAC,CAAA;IACX,CAAC;IAED,MAAM,CAAC,aAAqB;QAC1B,OAAO,qBAAqB,aAAa,GAAG,CAAA;IAC9C,CAAC;CACF;AAED,kBAAe,MAAM,CAAA"}

package/services/aws/dynamodb/utils/operators/GreaterThan.d.ts

@@ -1,7 +1,7 @@
 import DynamoOperator from './DynamoOperator';
 declare class GreaterThan extends DynamoOperator<number | string> {
     constructor(numberToExceed: number | string);
-    render(attributeName: string): string;
+    render(attributeName: string, paramOffset?: number): string;
     static fromValue(numberToExceed: number | string): GreaterThan;
 }
 export default GreaterThan;

package/services/aws/dynamodb/utils/operators/GreaterThan.js

@@ -8,8 +8,9 @@ class GreaterThan extends DynamoOperator_1.default {
     constructor(numberToExceed) {
         super([numberToExceed]);
     }
-    render(attributeName) {
-        return `#${attributeName} > ${this.makeAttrValueName(attributeName, 0)}`;
+    render(attributeName, paramOffset) {
+        const actualOffset = paramOffset !== null && paramOffset !== void 0 ? paramOffset : 0;
+        return `#${attributeName} > ${this.makeAttrValueName(attributeName, actualOffset)}`;
     }
     static fromValue(numberToExceed) {
         return new GreaterThan(numberToExceed);

package/services/aws/dynamodb/utils/operators/GreaterThan.js.map

@@ -1 +1 @@
-{"version":3,"file":"GreaterThan.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/GreaterThan.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,WAAY,SAAQ,wBAA+B;IACvD,YAAmB,cAA+B;QAChD,KAAK,CAAC,CAAC,cAAc,CAAC,CAAC,CAAA;IACzB,CAAC;IAED,MAAM,CAAC,aAAqB;QAC1B,OAAO,IAAI,aAAa,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,CAAA;IAC1E,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,cAA+B;QACrD,OAAO,IAAI,WAAW,CAAC,cAAc,CAAC,CAAA;IACxC,CAAC;CACF;AAED,kBAAe,WAAW,CAAA"}
+{"version":3,"file":"GreaterThan.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/GreaterThan.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,WAAY,SAAQ,wBAA+B;IACvD,YAAmB,cAA+B;QAChD,KAAK,CAAC,CAAC,cAAc,CAAC,CAAC,CAAA;IACzB,CAAC;IAED,MAAM,CAAC,aAAqB,EAAE,WAAoB;QAChD,MAAM,YAAY,GAAG,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,CAAC,CAAA;QAErC,OAAO,IAAI,aAAa,MAAM,IAAI,CAAC,iBAAiB,CAClD,aAAa,EACb,YAAY,CACb,EAAE,CAAA;IACL,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,cAA+B;QACrD,OAAO,IAAI,WAAW,CAAC,cAAc,CAAC,CAAA;IACxC,CAAC;CACF;AAED,kBAAe,WAAW,CAAA"}

package/services/aws/dynamodb/utils/operators/GreaterThanOrEquals.d.ts

@@ -1,7 +1,7 @@
 import DynamoOperator from './DynamoOperator';
 declare class GreaterThanOrEquals extends DynamoOperator<number | string> {
     constructor(valueToExceedOrMatch: number | string);
-    render(attributeName: string): string;
+    render(attributeName: string, paramOffset?: number): string;
     static fromValue(valueToExceedOrMatch: number | string): GreaterThanOrEquals;
 }
 export default GreaterThanOrEquals;

package/services/aws/dynamodb/utils/operators/GreaterThanOrEquals.js

@@ -8,8 +8,9 @@ class GreaterThanOrEquals extends DynamoOperator_1.default {
     constructor(valueToExceedOrMatch) {
         super([valueToExceedOrMatch]);
     }
-    render(attributeName) {
-        return `#${attributeName} >= ${this.makeAttrValueName(attributeName, 0)}`;
+    render(attributeName, paramOffset) {
+        const actualOffset = paramOffset !== null && paramOffset !== void 0 ? paramOffset : 0;
+        return `#${attributeName} >= ${this.makeAttrValueName(attributeName, actualOffset)}`;
     }
     static fromValue(valueToExceedOrMatch) {
         return new GreaterThanOrEquals(valueToExceedOrMatch);