electrodb 1.6.3 → 1.7.2

package/CHANGELOG.md

@@ -146,4 +146,17 @@ All notable changes to this project will be documented in this file. Breaking ch
 
 ## [1.6.3] - 2022-02-22
 ### Added
-- Add `data` update operation `ifNotExists` to allow for use of the UpdateExpression function "if_not_exists()".
+- Add `data` update operation `ifNotExists` to allow for use of the UpdateExpression function "if_not_exists()".
+
+## [1.7.0] - 2022-03-13
+### Added
+- New feature: "Listeners". Listeners open the door to some really cool tooling that was not possible because of how ElectroDB augments raw DynamoDB responses and did not provide easy access to raw DyanmoDB parameters. [[read more](./README.md#listeners)]
+
+## [1.7.1] - 2022-03-19
+### Added
+- Adding support for the v3 DyanmoDBClient. This change also brings in a new ElectroDB dependency [@aws-sdk/lib-dynamodb](https://www.npmjs.com/package/@aws-sdk/client-dynamodb). [[read more](./README.md#aws-dynamodb-client)]
+
+## [1.7.2] - 2022-03-27
+### Fixed
+- Fixed issue#111, `update` method specific query option typing no longer lost when using a `where` method in a query chain
+- Fixing incorrect typing for exposed `UpdateEntityItem` type. Exported type was missing composite key attributes

package/README.md

@@ -205,6 +205,14 @@ tasks
         * [Pagination Example](#pagination-example)
   * [Query Examples](#query-examples)
   * [Query Options](#query-options)
+- [AWS DynamoDB Client](#aws-dynamodb-client)
+  * [V2 Client](#v2-client)
+  * [V3 Client](#v3-client)
+- [Events](#events)
+  * [Query Event](#query-event)
+  * [Results Event](#results-event)
+- [Logging](#logging)
+- [Listeners](#listeners)
 - [Errors:](#errors-)
     + [No Client Defined On Model](#no-client-defined-on-model)
     + [Invalid Identifier](#invalid-identifier)
@@ -305,9 +313,9 @@ npm install electrodb --save
 # Usage
 Require/import `Entity` and/or `Service` from `electrodb`:
 ```javascript  
-const {Entity, Service} = require("electrodb");
+const { Entity, Service } = require("electrodb");
 // or 
-import {Entity, Service} from "electrodb";
+import { Entity, Service } from "electrodb";
 ```
 
 # Entities and Services
@@ -325,9 +333,9 @@ In ***ElectroDB*** an `Entity` is represents a single business object. For examp
 
 Require or import `Entity` from `electrodb`:
 ```javascript  
-const {Entity} = require("electrodb");
+const { Entity } = require("electrodb");
 // or
-import {Entity} from "electrodb";
+import { Entity } from "electrodb";
 ```
 
 > When using TypeScript, for strong type checking, be sure to either add your model as an object literal to the Entity constructor or create your model using const assertions with the `as const` syntax.
@@ -337,9 +345,9 @@ In ***ElectroDB*** a `Service` represents a collection of related Entities. Serv
 
 Require:
 ```javascript  
-const {Service} = require("electrodb");
+const { Service } = require("electrodb");
 // or
-import {Service} from "electrodb";
+import { Service } from "electrodb";
 ```
 
 ## TypeScript Support
@@ -371,7 +379,7 @@ The property name you assign the entity will then be "alias", or name, you can r
 
 Services take an optional second parameter, similar to Entities, with a `client` and `table`. Using this constructor interface, the Service will utilize the values from those entities, if they were provided, or be passed values to override the `client` or `table` name on the individual entities.
 
-Not yet available for TypeScript, this pattern will also accept Models, or a mix of Entities and Models, in the same object literal format.
+While not yet typed, this pattern will also accept Models, or a mix of Entities and Models, in the same object literal format.
 
 ## Join
 When using JavaScript, use `join` to add [Entities](#entities) or [Models](#model) onto a Service.
@@ -4000,7 +4008,7 @@ TaskApp.collections
 ```
 
 ## Execute Queries
-Lastly, all query chains end with either a `.go()` or a `.params()` method invocation. These will either execute the query to DynamoDB (`.go()`) or return formatted parameters for use with the DynamoDB docClient (`.params()`).
+Lastly, all query chains end with either a `.go()`, `.params()`, or `page()` method invocation. These terminal methods will either execute the query to DynamoDB (`.go()`) or return formatted parameters for use with the DynamoDB docClient (`.params()`).
 
 Both `.params()` and `.go()` take a query configuration object which is detailed more in the section [Query Options](#query-options).
 
@@ -4287,6 +4295,8 @@ By default, **ElectroDB** enables you to work with records as the names and prop
   ignoreOwnership?: boolean;
   limit?: number;
   pages?: number;
+  logger?: (event) => void;
+  listeners Array<(event) => void>;
 };
 ```
 
@@ -4304,6 +4314,333 @@ response        | `"default"`          | Used as a convenience for applying the
 ignoreOwnership | `false`              | By default, **ElectroDB** interrogates items returned from a query for the presence of matching entity "identifiers". This helps to ensure other entities, or other versions of an entity, are filtered from your results. If you are using ElectroDB with an existing table/dataset you can turn off this feature by setting this property to `true`.
 limit           | _none_               | A target for the number of items to return from DynamoDB. If this option is passed, Queries on entities and through collections will paginate DynamoDB until this limit is reached or all items for that query have been returned.
 pages           | ∞                    | How many DynamoDB pages should a query iterate through before stopping. By default ElectroDB paginate through all results for your query.
+listeners       | `[]`                 | An array of callbacks that are invoked when [internal ElectroDB events](#events) occur.
+logger          | _none_               | A convenience option for a single event listener that semantically can be used for logging.
+
+# AWS DynamoDB Client
+ElectroDB supports both the [v2](https://www.npmjs.com/package/aws-sdk) and [v3](https://www.npmjs.com/package/@aws-sdk/client-dynamodb) aws clients. The client can be supplied creating a new Entity or Service, or added to a Entity/Service instance via the `setClient()` method.
+
+*On the instantiation of an `Entity`:*
+```typescript
+import { Entity } from 'electrodb';
+import { DocumentClient } from "aws-sdk/clients/dynamodb";
+const table = "my_table_name";
+const client = new DocumentClient({
+    region: "us-east-1"
+});
+
+const task = new Entity({
+    // your model
+}, {
+    client, // <----- client
+    table,
+});
+```
+
+*On the instantiation of an `Service`:*
+```typescript
+import { Entity } from 'electrodb';
+import { DocumentClient } from "aws-sdk/clients/dynamodb";
+const table = "my_table_name";
+const client = new DocumentClient({
+    region: "us-east-1"
+});
+
+const task = new Entity({
+    // your model
+});
+
+const user = new Entity({
+    // your model
+});
+
+const service = new Service({ task, user }, {
+   client, // <----- client
+   table,
+});
+```
+
+*Via the `setClient` method:*
+```typescript
+import { Entity } from 'electrodb';
+import { DocumentClient } from "aws-sdk/clients/dynamodb";
+const table = "my_table_name";
+const client = new DocumentClient({
+    region: "us-east-1"
+});
+
+const task = new Entity({
+    // your model
+});
+
+task.setClient(client);
+```
+
+## V2 Client
+The [v2](https://www.npmjs.com/package/aws-sdk) sdk will work out of the box with the the DynamoDB DocumentClient.
+
+*Example:*
+```typescript
+import { DocumentClient } from "aws-sdk/clients/dynamodb";
+const client = new DocumentClient({
+    region: "us-east-1"
+});
+```
+
+## V3 Client
+The [v3](https://www.npmjs.com/package/@aws-sdk/client-dynamodb) client will work out of the box with the the DynamoDBClient.
+
+```typescript
+import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
+const client = new DynamoDBClient({
+    region: "us-east-1"
+});
+```
+
+# Logging
+A logger callback function can be provided both the at the instantiation of an `Entity` or `Service` instance or as a [Query Option](#query-options). The property `logger` is implemented as a convenience property; under the hood ElectroDB uses this property identically to how it uses a [Listener](#listeners).
+
+*On the instantiation of an `Entity`:*
+```typescript
+import { DynamoDB } from 'aws-sdk';
+import { Entity, ElectroEvent } from 'electrodb';
+
+const table = "my_table_name";
+const client = new DynamoDB.DocumentClient();
+const logger = (event: ElectroEvent) => {
+    console.log(JSON.stringify(event, null, 4));
+}
+
+const task = new Entity({
+    // your model
+}, {
+    client,
+    table,
+    logger // <----- logger listener
+});
+```
+
+*On the instantiation of an `Service`:*
+```typescript
+import { DynamoDB } from 'aws-sdk';
+import { Entity, ElectroEvent } from 'electrodb';
+
+const table = "my_table_name";
+const client = new DynamoDB.DocumentClient();
+const logger = (event: ElectroEvent) => {
+    console.log(JSON.stringify(event, null, 4));
+}
+
+const task = new Entity({
+    // your model
+});
+
+const user = new Entity({
+    // your model
+});
+
+const service = new Service({ task, user }, {
+   client,
+   table,
+   logger // <----- logger listener
+});
+```
+
+*As a [Query Option](#query-options):*
+```typescript
+const logger = (event: ElectroEvent) => {
+    console.log(JSON.stringify(event, null, 4));
+}
+
+task.query
+    .assigned({ userId })
+    .go({ logger });
+```
+
+# Events
+ElectroDB can be supplied with callbacks (see: [logging](#logging) and [listeners](#listeners) to learn how) to be invoked after certain request lifecycles. This can be useful for logging, analytics, expanding functionality, and more. The following are events currently supported by ElectroDB -- if you would like to see additional events feel free to create a github issue to discuss your concept/need!
+
+## Query Event
+The `query` event occurs when a query is made via the terminal methods [`go()`](#go) and [`page()`](#page). The event includes the exact parameters given to the provided client, the ElectroDB method used, and the ElectroDB configuration provided.
+
+*Type:*
+```typescript
+interface ElectroQueryEvent<P extends any = any> {
+    type: 'query';
+    method: "put" | "get" | "query" | "scan" | "update" | "delete" | "remove" | "patch" | "create" | "batchGet" | "batchWrite";
+    config: any;
+    params: P;
+}
+```
+
+*Example Input:*
+```typescript
+const prop1 = "22874c81-27c4-4264-92c3-b280aa79aa30";
+const prop2 = "366aade8-a7c0-4328-8e14-0331b185de4e";
+const prop3 = "3ec9ed0c-7497-4d05-bdb8-86c09a618047";
+
+entity.update({ prop1, prop2 })
+    .set({ prop3 })
+    .go()
+```
+
+*Example Output:*
+```json
+{
+    "type": "query",
+    "method": "update",
+    "params": {
+        "UpdateExpression": "SET #prop3 = :prop3_u0, #prop1 = :prop1_u0, #prop2 = :prop2_u0, #__edb_e__ = :__edb_e___u0, #__edb_v__ = :__edb_v___u0",
+        "ExpressionAttributeNames": {
+            "#prop3": "prop3",
+            "#prop1": "prop1",
+            "#prop2": "prop2",
+            "#__edb_e__": "__edb_e__",
+            "#__edb_v__": "__edb_v__"
+        },
+        "ExpressionAttributeValues": {
+            ":prop3_u0": "3ec9ed0c-7497-4d05-bdb8-86c09a618047",
+            ":prop1_u0": "22874c81-27c4-4264-92c3-b280aa79aa30",
+            ":prop2_u0": "366aade8-a7c0-4328-8e14-0331b185de4e",
+            ":__edb_e___u0": "entity",
+            ":__edb_v___u0": "1"
+        },
+        "TableName": "electro",
+        "Key": {
+            "pk": "$test#prop1_22874c81-27c4-4264-92c3-b280aa79aa30",
+            "sk": "$testcollection#entity_1#prop2_366aade8-a7c0-4328-8e14-0331b185de4e"
+        }
+    },
+    "config": {  }
+}
+```
+
+## Results Event
+The `results` event occurs when results are returned from DynamoDB. The event includes the exact results returned from the provided client, the ElectroDB method used, and the ElectroDB configuration provided. Note this event handles both failed (or thrown) results in addition to returned (or resolved) results.
+
+> **Pro-Tip:**
+> Use this event to hook into the DyanmoDB's [consumed capacity](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Query.html#DDB-Query-request-ReturnConsumedCapacity) statistics to learn more about the impact and cost associated with your queries.
+
+*Type::*
+```typescript
+interface ElectroResultsEvent<R extends any = any> {
+    type: 'results';
+    method: "put" | "get" | "query" | "scan" | "update" | "delete" | "remove" | "patch" | "create" | "batchGet" | "batchWrite";
+    config: any;
+    results: R;
+    success: boolean;
+}
+```
+
+*Example Input:*
+```typescript
+const prop1 = "22874c81-27c4-4264-92c3-b280aa79aa30";
+const prop2 = "366aade8-a7c0-4328-8e14-0331b185de4e";
+
+entity.get({ prop1, prop2 }).go();
+```
+
+*Example Output:*
+```typescript
+{
+  "type": "results",
+  "method": "get",
+  "config": {  },
+  "success": true,
+  "results": {
+    "Item": {
+      "prop2": "366aade8-a7c0-4328-8e14-0331b185de4e",
+      "sk": "$testcollection#entity_1#prop2_366aade8-a7c0-4328-8e14-0331b185de4e",
+      "prop1": "22874c81-27c4-4264-92c3-b280aa79aa30",
+      "prop3": "3ec9ed0c-7497-4d05-bdb8-86c09a618047",
+      "__edb_e__": "entity",
+      "__edb_v__": "1",
+      "pk": "$test_1#prop1_22874c81-27c4-4264-92c3-b280aa79aa30"
+    }
+  }
+}
+```
+
+# Listeners
+ElectroDB can be supplied with callbacks (called "Listeners") to be invoked after certain request lifecycles. Unlike [Attribute Getters and Setters](#attribute-getters-and-setters), Listeners are implemented to react to events passively, not to modify values during the request lifecycle. Listeners can be useful for logging, analytics, expanding functionality, and more. Listeners can be provide both the at the instantiation of an `Entity` or `Service` instance or as a [Query Option](#query-options).
+
+> _NOTE: Listeners treated as synchronous callbacks and are not awaited. In the event that a callback throws an exception, ElectroDB will quietly catch and log the exception with `console.error` to prevent the exception from impacting your query.
+
+*On the instantiation of an `Entity`:*
+```typescript
+import { DynamoDB } from 'aws-sdk';
+import { Entity, ElectroEvent } from 'electrodb';
+
+const table = "my_table_name";
+const client = new DynamoDB.DocumentClient();
+const listener1 = (event: ElectroEvent) => {
+    // do work
+}
+
+const listener2 = (event: ElectroEvent) => {
+    // do work
+}
+
+const task = new Entity({
+    // your model
+}, {
+    client,
+    table,
+    listeners: [
+        listener1,
+        listener2, // <----- supports multiple listeners
+    ]
+});
+```
+
+*On the instantiation of an `Service`:*
+```typescript
+import { DynamoDB } from 'aws-sdk';
+import { Entity, ElectroEvent } from 'electrodb';
+
+const table = "my_table_name";
+const client = new DynamoDB.DocumentClient();
+
+const listener1 = (event: ElectroEvent) => {
+    // do work
+}
+
+const listener2 = (event: ElectroEvent) => {
+    // do work
+}
+
+const task = new Entity({
+    // your model
+});
+
+const user = new Entity({
+    // your model
+});
+
+const service = new Service({ task, user }, {
+    client,
+    table,
+    listeners: [
+        listener1,
+        listener2, // <----- supports multiple listeners
+    ]
+});
+```
+
+*As a [Query Option](#query-options):*
+```typescript
+const listener1 = (event: ElectroEvent) => {
+    // do work
+}
+
+const listener2 = (event: ElectroEvent) => {
+    // do work
+}
+
+task.query
+    .assigned({ userId })
+    .go({ listeners: [listener1, listener2] });
+```
 
 # Errors:
 
@@ -4311,7 +4648,7 @@ Error Code | Description
 :--------: | -------------------- 
 1000s      | Configuration Errors
 2000s      | Invalid Queries     
-3000s      | User Defined Errors 
+3000s      | User Defined Errors
 4000s      | DynamoDB Errors     
 5000s      | Unexpected Errors   
 

package/index.d.ts

@@ -1,3 +1,9 @@
+type Flatten<T> = T extends any[]
+  ? T
+  : T extends object
+    ? {[Key in keyof T]: Flatten<T[Key]>}
+    : T;
+
 declare const WhereSymbol: unique symbol;
 declare const UpdateDataSymbol: unique symbol;
 
@@ -974,6 +980,8 @@ interface QueryOptions {
     originalErr?: boolean;
     ignoreOwnership?: boolean;
     pages?: number;
+    listeners?: Array<EventListener>;
+    logger?: EventListener;
 }
 
 // subset of QueryOptions
@@ -985,6 +993,13 @@ interface UpdateQueryOptions extends QueryOptions {
     response?: "default" | "none" | 'all_old' | 'updated_old' | 'all_new' | 'updated_new';
 }
 
+interface UpdateQueryParams {
+    response?: "default" | "none" | 'all_old' | 'updated_old' | 'all_new' | 'updated_new';
+    table?: string;
+    params?: object;
+    originalErr?: boolean;
+}
+
 interface DeleteQueryOptions extends QueryOptions {
     response?: "default" | "none" | 'all_old';
 }
@@ -1040,7 +1055,13 @@ type SingleRecordOperationOptions<A extends string, F extends A, C extends strin
 type PutRecordOperationOptions<A extends string, F extends A, C extends string, S extends Schema<A,F,C>, ResponseType> = {
     go: GoRecord<ResponseType, PutQueryOptions>;
     params: ParamRecord<PutQueryOptions>;
-    where: WhereClause<A,F,C,S,Item<A,F,C,S,S["attributes"]>,SingleRecordOperationOptions<A,F,C,S,ResponseType>>;
+    where: WhereClause<A,F,C,S,Item<A,F,C,S,S["attributes"]>,PutRecordOperationOptions<A,F,C,S,ResponseType>>;
+};
+
+type UpdateRecordOperationOptions<A extends string, F extends A, C extends string, S extends Schema<A,F,C>, ResponseType> = {
+    go: GoRecord<ResponseType, UpdateQueryOptions>;
+    params: ParamRecord<UpdateQueryParams>;
+    where: WhereClause<A,F,C,S,Item<A,F,C,S,S["attributes"]>,PutRecordOperationOptions<A,F,C,S,ResponseType>>;
 };
 
 type DeleteRecordOperationOptions<A extends string, F extends A, C extends string, S extends Schema<A,F,C>, ResponseType> = {
@@ -1056,7 +1077,7 @@ type BulkRecordOperationOptions<A extends string, F extends A, C extends string,
 
 type SetRecordActionOptions<A extends string, F extends A, C extends string, S extends Schema<A,F,C>, SetAttr,IndexCompositeAttributes,TableItem> = {
     go: GoRecord<Partial<TableItem>, UpdateQueryOptions>;
-    params: ParamRecord<UpdateQueryOptions>;
+    params: ParamRecord<UpdateQueryParams>;
     set: SetRecord<A,F,C,S, SetItem<A,F,C,S>,IndexCompositeAttributes,TableItem>;
     remove: SetRecord<A,F,C,S, Array<keyof SetItem<A,F,C,S>>,IndexCompositeAttributes,TableItem>;
     add: SetRecord<A,F,C,S, AddItem<A,F,C,S>,IndexCompositeAttributes,TableItem>;
@@ -1064,7 +1085,7 @@ type SetRecordActionOptions<A extends string, F extends A, C extends string, S e
     append: SetRecord<A,F,C,S, AppendItem<A,F,C,S>,IndexCompositeAttributes,TableItem>;
     delete: SetRecord<A,F,C,S, DeleteItem<A,F,C,S>,IndexCompositeAttributes,TableItem>;
     data: DataUpdateMethodRecord<A,F,C,S, Item<A,F,C,S,S["attributes"]>,IndexCompositeAttributes,TableItem>;
-    where: WhereClause<A,F,C,S, Item<A,F,C,S,S["attributes"]>,RecordsActionOptions<A,F,C,S,TableItem,IndexCompositeAttributes>>;
+    where: WhereClause<A,F,C,S, Item<A,F,C,S,S["attributes"]>,SetRecordActionOptions<A,F,C,S,SetAttr,IndexCompositeAttributes,TableItem>>;
 }
 
 type SetRecord<A extends string, F extends A, C extends string, S extends Schema<A,F,C>, SetAttr, IndexCompositeAttributes, TableItem> = (properties: SetAttr) => SetRecordActionOptions<A,F,C,S, SetAttr, IndexCompositeAttributes, TableItem>;
@@ -1118,23 +1139,77 @@ type DocumentClient = {
     batchWrite: DocumentClientMethod;
     batchGet: DocumentClientMethod;
     scan: DocumentClientMethod;
-}
+} | {
+    send: (command: any) => Promise<any>;
+}
+
+type ElectroDBMethodTypes = "put" | "get" | "query" | "scan" | "update" | "delete" | "remove" | "patch" | "create" | "batchGet" | "batchWrite";
+
+interface ElectroQueryEvent<P extends any = any> {
+    type: 'query';
+    method: ElectroDBMethodTypes;
+    config: any;
+    params: P;
+}
+
+interface ElectroResultsEvent<R extends any = any> {
+    type: 'results';
+    method: ElectroDBMethodTypes;
+    config: any;
+    results: R;
+    success: boolean;
+}
+
+type ElectroEvent = 
+    ElectroQueryEvent
+    | ElectroResultsEvent;
+
+type ElectroEventType = Pick<ElectroEvent, 'type'>;
+
+type EventListener = (event: ElectroEvent) => void;
+
+// todo: coming soon, more events!
+// | {
+//     name: "error";
+//     type: "configuration_error" | "invalid_query" | "dynamodb_client";
+//     message: string;
+//     details: ElectroError;
+// } | {
+//     name: "error";
+//     type: "user_defined";
+//     message: string;
+//     details: ElectroValidationError;
+// } | {
+//     name: "warn";
+//     type: "deprecation_warning" | "optimization_suggestion";
+//     message: string;
+//     details: any;
+// } | {
+//     name: "info";
+//     type: "client_updated" | "table_overwritten";
+//     message: string;
+//     details: any;
+// };
 
 type EntityConfiguration = {
     table?: string;
-    client?: DocumentClient
+    client?: DocumentClient;
+    listeners?: Array<EventListener>;
+    logger?: EventListener;
 };
 
 type ServiceConfiguration = {
     table?: string;
-    client?: DocumentClient
+    client?: DocumentClient;
+    listeners?: Array<EventListener>;
+    logger?: EventListener;
 };
 
 type ParseSingleInput = {
-        Item?: {[key: string]: any}
-    } | {
-        Attributes?: {[key: string]: any}
-    } | null
+    Item?: {[key: string]: any}
+} | {
+    Attributes?: {[key: string]: any}
+} | null;
 
 type ParseMultiInput = {
     Items?: {[key: string]: any}[]
@@ -1426,7 +1501,7 @@ export type CreateEntityItem<E extends Entity<any, any, any, any>> =
 
 export type UpdateEntityItem<E extends Entity<any, any, any, any>> =
     E extends Entity<infer A, infer F, infer C, infer S>
-        ? SetItem<A, F, C, S>
+        ? Partial<ResponseItem<A,F,C,S>>
         : never;
 
 export type UpdateAddEntityItem<E extends Entity<any, any, any, any>> =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electrodb",
-  "version": "1.6.3",
+  "version": "1.7.2",
   "description": "A library to more easily create and interact with multiple entities and heretical relationships in dynamodb",
   "main": "index.js",
   "scripts": {
@@ -25,6 +25,8 @@
   },
   "homepage": "https://github.com/tywalch/electrodb#readme",
   "devDependencies": {
+    "@aws-sdk/client-dynamodb": "^3.54.1",
+    "@aws-sdk/lib-dynamodb": "^3.54.1",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/chai": "^4.2.12",
     "@types/mocha": "^8.0.3",
@@ -59,6 +61,7 @@
     "directory": "test"
   },
   "dependencies": {
-    "jsonschema": "1.2.7"
+    "jsonschema": "1.2.7",
+    "@aws-sdk/lib-dynamodb": "^3.54.1"
   }
 }

package/src/clauses.js

@@ -540,8 +540,9 @@ let clauses = {
 				if (!v.isStringHasLength(options.table) && !v.isStringHasLength(entity._getTableName())) {
 					throw new e.ElectroError(e.ErrorCodes.MissingTable, `Table name not defined. Table names must be either defined on the model, instance configuration, or as a query option.`);
 				}
+				const method = state.getMethod();
 				let results;
-				switch (state.getMethod()) {
+				switch (method) {
 					case MethodTypes.query:
 						results = entity._queryParams(state, options);
 						break;
@@ -556,7 +557,7 @@ let clauses = {
 						break;
 				}
 
-				if (state.getMethod() === MethodTypes.update && results.ExpressionAttributeValues && Object.keys(results.ExpressionAttributeValues).length === 0) {
+				if (method === MethodTypes.update && results.ExpressionAttributeValues && Object.keys(results.ExpressionAttributeValues).length === 0) {
 					// An update that only does a `remove` operation would result in an empty object
 					// todo: change the getValues() method to return undefined in this case (would potentially require a more generous refactor)
 					delete results.ExpressionAttributeValues;

package/src/client.js

@@ -0,0 +1,135 @@
+const {isFunction} = require('./validations');
+const {ElectroError, ErrorCodes} = require('./errors');
+const lib = require('@aws-sdk/lib-dynamodb');
+
+const DocumentClientVersions = {
+    v2: 'v2',
+    v3: 'v3',
+    electro: 'electro',
+};
+
+const v3Methods = ['send'];
+const v2Methods = ['get', 'put', 'update', 'delete', 'batchWrite', 'batchGet', 'scan', 'query', 'createSet'];
+const supportedClientVersions = {
+    [DocumentClientVersions.v2]: v2Methods,
+    [DocumentClientVersions.v3]: v3Methods,
+}
+
+class DocumentClientV3Wrapper {
+    static init(client) {
+        return new DocumentClientV3Wrapper(client, lib);
+    }
+
+    constructor(client, lib) {
+        this.client = client;
+        this.lib = lib;
+    }
+
+    promiseWrap(fn) {
+        return {
+            promise: async () => {
+                return fn();
+            }
+        }
+    }
+
+    get(params) {
+        return this.promiseWrap(() => {
+            const command = new this.lib.GetCommand(params);
+            return this.client.send(command);
+        });
+    }
+    put(params) {
+        return this.promiseWrap(() => {
+            const command = new this.lib.PutCommand(params);
+            return this.client.send(command);
+        });
+    }
+    update(params) {
+        return this.promiseWrap(() => {
+            const command = new this.lib.UpdateCommand(params);
+            return this.client.send(command);
+        });
+    }
+    delete(params) {
+        return this.promiseWrap(async () => {
+            const command = new this.lib.DeleteCommand(params);
+            return this.client.send(command);
+        });
+    }
+    batchWrite(params) {
+        return this.promiseWrap(async () => {
+            const command = new this.lib.BatchWriteCommand(params);
+            return this.client.send(command);
+        });
+    }
+    batchGet(params) {
+        return this.promiseWrap(async () => {
+            const command = new this.lib.BatchGetCommand(params);
+            return this.client.send(command);
+        });
+    }
+    scan(params) {
+        return this.promiseWrap(async () => {
+            const command = new this.lib.ScanCommand(params);
+            return this.client.send(command);
+        });
+    }
+    query(params) {
+        return this.promiseWrap(async () => {
+            const command = new this.lib.QueryCommand(params);
+            return this.client.send(command);
+        });
+    }
+    createSet(value) {
+        if (Array.isArray(value)) {
+            return new Set(value);
+        } else {
+            return new Set([value]);
+        }
+    }
+}
+
+function identifyClientVersion(client = {}) {
+    if (client instanceof DocumentClientV3Wrapper) return DocumentClientVersions.electro;
+    for (const [version, methods] of Object.entries(supportedClientVersions)) {
+        const hasMethods = methods.every(method => {
+            return method in client && isFunction(client[method]);
+        });
+        if (hasMethods) {
+            return version;
+        }
+    }
+}
+
+function normalizeClient(client) {
+    if (client === undefined) return client;
+    const version = identifyClientVersion(client);
+    switch(version) {
+        case DocumentClientVersions.v3:
+            return DocumentClientV3Wrapper.init(client);
+        case DocumentClientVersions.v2:
+        case DocumentClientVersions.electro:
+            return client;
+        default:
+            throw new ElectroError(ErrorCodes.InvalidClientProvided, 'Invalid DynamoDB Document Client provided. ElectroDB supports the v2 and v3 DynamoDB Document Clients from the aws-sdk');
+    }
+}
+
+function normalizeConfig(config = {}) {
+    return {
+        ...config,
+        client: normalizeClient(config.client)
+    }
+}
+
+module.exports = {
+    v2Methods,
+    v3Methods,
+    normalizeClient,
+    normalizeConfig,
+    identifyClientVersion,
+    DocumentClientVersions,
+    supportedClientVersions,
+    DocumentClientV3Wrapper,
+};

package/src/entity.js

@@ -5,12 +5,19 @@ const { FilterFactory } = require("./filters");
 const { FilterOperations } = require("./operations");
 const { WhereFactory } = require("./where");
 const { clauses, ChainState } = require("./clauses");
+const {EventManager} = require('./events');
 const validations = require("./validations");
-const utilities = require("./util");
+const c = require('./client');
+const u = require("./util");
 const e = require("./errors");
 
 class Entity {
 	constructor(model, config = {}) {
+		config = c.normalizeConfig(config);
+		this.eventManager = new EventManager({
+			listeners: config.listeners
+		});
+		this.eventManager.add(config.logger);
 		this._validateModel(model);
 		this.version = EntityVersions.v1;
 		this.config = config;
@@ -43,7 +50,7 @@ class Entity {
 
 	setIdentifier(type = "", identifier = "") {
 		if (!this.identifiers[type]) {
-			throw new e.ElectroError(e.ErrorCodes.InvalidIdentifier, `Invalid identifier type: "${type}". Valid identifiers include: ${utilities.commaSeparatedString(Object.keys(this.identifiers))}`);
+			throw new e.ElectroError(e.ErrorCodes.InvalidIdentifier, `Invalid identifier type: "${type}". Valid identifiers include: ${u.commaSeparatedString(Object.keys(this.identifiers))}`);
 		} else {
 			this.identifiers[type] = identifier;
 		}
@@ -252,9 +259,32 @@ class Entity {
 		}
 	}
 
-	async _exec(method, parameters) {
-		return this.client[method](parameters).promise()
+	async _exec(method, params, config = {}) {
+		const notifyQuery = () => {
+			this.eventManager.trigger({
+				type: "query",
+				method,
+				params,
+				config,
+			}, config.listeners);
+		};
+		const notifyResults = (results, success) => {
+			this.eventManager.trigger({
+				type: "results",
+				method,
+				config,
+				success,
+				results,
+			}, config.listeners);
+		}
+		return this.client[method](params).promise()
+			.then((results) => {
+				notifyQuery();
+				notifyResults(results, true);
+				return results;
+			})
 			.catch(err => {
+				notifyResults(err, false);
 				err.__isAWSError = true;
 				throw err;
 			});
@@ -266,10 +296,10 @@ class Entity {
 		}
 		let results = [];
 		let concurrent = this._normalizeConcurrencyValue(config.concurrent)
-		let concurrentOperations = utilities.batchItems(parameters, concurrent);
+		let concurrentOperations = u.batchItems(parameters, concurrent);
 		for (let operation of concurrentOperations) {
 			await Promise.all(operation.map(async params => {
-				let response = await this._exec(MethodTypes.batchWrite, params);
+				let response = await this._exec(MethodTypes.batchWrite, params, config);
 				if (validations.isFunction(config.parse)) {
 					let parsed = await config.parse(config, response);
 					if (parsed) {
@@ -292,13 +322,13 @@ class Entity {
 			parameters = [parameters];
 		}
 		let concurrent = this._normalizeConcurrencyValue(config.concurrent)
-		let concurrentOperations = utilities.batchItems(parameters, concurrent);
+		let concurrentOperations = u.batchItems(parameters, concurrent);
 
 		let resultsAll = [];
 		let unprocessedAll = [];
 		for (let operation of concurrentOperations) {
 			await Promise.all(operation.map(async params => {
-				let response = await this._exec(MethodTypes.batchGet, params);
+				let response = await this._exec(MethodTypes.batchGet, params, config);
 				if (validations.isFunction(config.parse)) {
 					resultsAll.push(await config.parse(config, response));
 					return;
@@ -328,7 +358,7 @@ class Entity {
 			let limit = max === undefined
 				? parameters.Limit
 				: max - count;
-			let response = await this._exec("query", {ExclusiveStartKey, ...parameters, Limit: limit});
+			let response = await this._exec("query", {ExclusiveStartKey, ...parameters, Limit: limit}, config);
 
 			ExclusiveStartKey = response.LastEvaluatedKey;
 
@@ -363,7 +393,7 @@ class Entity {
 	}
 
 	async executeOperation(method, parameters, config) {
-		let response = await this._exec(method, parameters);
+		let response = await this._exec(method, parameters, config);
 		if (validations.isFunction(config.parse)) {
 			return config.parse(config, response);
 		}
@@ -560,7 +590,7 @@ class Entity {
 
 	_setClient(client) {
 		if (client) {
-			this.client = client;
+			this.client = c.normalizeClient(client);
 		}
 	}
 
@@ -751,13 +781,14 @@ class Entity {
 			_isPagination: false,
 			_isCollectionQuery: false,
 			pages: undefined,
+			listeners: [],
 		};
 
 		config = options.reduce((config, option) => {
 			if (typeof option.response === 'string' && option.response.length) {
 				const format = 	ReturnValues[option.response];
 				if (format === undefined) {
-					throw new e.ElectroError(e.ErrorCodes.InvalidOptions, `Invalid value for query option "format" provided: "${option.format}". Allowed values include ${utilities.commaSeparatedString(Object.keys(ReturnValues))}.`);
+					throw new e.ElectroError(e.ErrorCodes.InvalidOptions, `Invalid value for query option "format" provided: "${option.format}". Allowed values include ${u.commaSeparatedString(Object.keys(ReturnValues))}.`);
 				}
 				config.response = format;
 				config.params.ReturnValues = FormatToReturnValues[format];
@@ -814,7 +845,7 @@ class Entity {
 				if (typeof Pager[option.pager] === "string") {
 					config.pager = option.pager;
 				} else {
-					throw new e.ElectroError(e.ErrorCodes.InvalidOptions, `Invalid value for option "pager" provided: "${option.pager}". Allowed values include ${utilities.commaSeparatedString(Object.keys(Pager))}.`);
+					throw new e.ElectroError(e.ErrorCodes.InvalidOptions, `Invalid value for option "pager" provided: "${option.pager}". Allowed values include ${u.commaSeparatedString(Object.keys(Pager))}.`);
 				}
 			}
 
@@ -822,7 +853,7 @@ class Entity {
 				if (typeof UnprocessedTypes[option.unprocessed] === "string") {
 					config.unproessed = UnprocessedTypes[option.unprocessed];
 				} else {
-					throw new e.ElectroError(e.ErrorCodes.InvalidOptions, `Invalid value for option "unprocessed" provided: "${option.unprocessed}". Allowed values include ${utilities.commaSeparatedString(Object.keys(UnprocessedTypes))}.`);
+					throw new e.ElectroError(e.ErrorCodes.InvalidOptions, `Invalid value for option "unprocessed" provided: "${option.unprocessed}". Allowed values include ${u.commaSeparatedString(Object.keys(UnprocessedTypes))}.`);
 				}
 			}
 
@@ -830,6 +861,20 @@ class Entity {
 				config.ignoreOwnership = option.ignoreOwnership;
 			}
 
+			if (option.listeners) {
+				if (Array.isArray(option.listeners)) {
+					config.listeners = config.listeners.concat(option.listeners);
+				}
+			}
+
+			if (option.logger) {
+				if (validations.isFunction(option.logger)) {
+					config.listeners.push(option.logger);
+				} else {
+					throw new e.ElectroError(e.ErrorCodes.InvalidLoggerProvided, `Loggers must be of type function`);
+				}
+			}
+
 			config.page = Object.assign({}, config.page, option.page);
 			config.params = Object.assign({}, config.params, option.params);
 			return config;
@@ -933,7 +978,7 @@ class Entity {
 				records.push(Key);
 			}
 		}
-		let batches = utilities.batchItems(records, MaxBatchItems.batchGet);
+		let batches = u.batchItems(records, MaxBatchItems.batchGet);
 		return batches.map(batch => {
 			return {
 				RequestItems: {
@@ -966,7 +1011,7 @@ class Entity {
 					throw new Error("Invalid method type");
 			}
 		}
-		let batches = utilities.batchItems(records, MaxBatchItems.batchWrite);
+		let batches = u.batchItems(records, MaxBatchItems.batchWrite);
 		return batches.map(batch => {
 			return {
 				RequestItems: {
@@ -1220,7 +1265,7 @@ class Entity {
 			let props = Object.keys(item);
 			let missing = require.filter((prop) => !props.includes(prop));
 			if (!missing) {
-				throw new e.ElectroError(e.ErrorCodes.MissingAttribute, `Item is missing attributes: ${utilities.commaSeparatedString(missing)}`);
+				throw new e.ElectroError(e.ErrorCodes.MissingAttribute, `Item is missing attributes: ${u.commaSeparatedString(missing)}`);
 			}
 		}
 
@@ -1229,7 +1274,7 @@ class Entity {
 				throw new Error(`Invalid attribute ${prop}`);
 			}
 			if (restrict.length && !restrict.includes(prop)) {
-				throw new Error(`${prop} is not a valid attribute: ${utilities.commaSeparatedString(restrict)}`);
+				throw new Error(`${prop} is not a valid attribute: ${u.commaSeparatedString(restrict)}`);
 			}
 			if (prop === undefined || skip.includes(prop)) {
 				continue;
@@ -1392,7 +1437,7 @@ class Entity {
 	_makeComparisonQueryParams(index = TableIndex, comparison = "", filter = {}, pk = {}, sk = {}) {
 		let operator = Comparisons[comparison];
 		if (!operator) {
-			throw new Error(`Unexpected comparison operator "${comparison}", expected ${utilities.commaSeparatedString(Object.values(Comparisons))}`);
+			throw new Error(`Unexpected comparison operator "${comparison}", expected ${u.commaSeparatedString(Object.values(Comparisons))}`);
 		}
 		let keyExpressions = this._queryKeyExpressionAttributeBuilder(
 			index,
@@ -1429,7 +1474,7 @@ class Entity {
 			let incompleteAccessPatterns = incomplete.map(({index}) => this.model.translations.indexes.fromIndexToAccessPattern[index]);
 			let missingFacets = incomplete.reduce((result, { missing }) => [...result, ...missing], []);
 			throw new e.ElectroError(e.ErrorCodes.IncompleteCompositeAttributes,
-				`Incomplete composite attributes: Without the composite attributes ${utilities.commaSeparatedString(missingFacets)} the following access patterns cannot be updated: ${utilities.commaSeparatedString(incompleteAccessPatterns.filter((val) => val !== undefined))} `,
+				`Incomplete composite attributes: Without the composite attributes ${u.commaSeparatedString(missingFacets)} the following access patterns cannot be updated: ${u.commaSeparatedString(incompleteAccessPatterns.filter((val) => val !== undefined))} `,
 			);
 		}
 		return complete;
@@ -1648,7 +1693,7 @@ class Entity {
 	_expectFacets(obj = {}, properties = [], type = "key composite attributes") {
 		let [incompletePk, missing, matching] = this._expectProperties(obj, properties);
 		if (incompletePk) {
-			throw new e.ElectroError(e.ErrorCodes.IncompleteCompositeAttributes, `Incomplete or invalid ${type} supplied. Missing properties: ${utilities.commaSeparatedString(missing)}`);
+			throw new e.ElectroError(e.ErrorCodes.IncompleteCompositeAttributes, `Incomplete or invalid ${type} supplied. Missing properties: ${u.commaSeparatedString(missing)}`);
 		} else {
 			return matching;
 		}
@@ -1721,10 +1766,10 @@ class Entity {
 
 		// If keys arent custom, set the prefixes
 		if (!keys.pk.isCustom) {
-			keys.pk.prefix = utilities.formatKeyCasing(pk, tableIndex.pk.casing);
+			keys.pk.prefix = u.formatKeyCasing(pk, tableIndex.pk.casing);
 		}
 		if (!keys.sk.isCustom) {
-			keys.sk.prefix = utilities.formatKeyCasing(sk, tableIndex.sk.casing);
+			keys.sk.prefix = u.formatKeyCasing(sk, tableIndex.sk.casing);
 		}
 
 		return keys;
@@ -1735,7 +1780,7 @@ class Entity {
 			? this.model.indexes[accessPattern].sk.casing
 			: undefined;
 
-		return utilities.formatKeyCasing(key, casing);
+		return u.formatKeyCasing(key, casing);
 	}
 
 	_validateIndex(index) {
@@ -1859,7 +1904,7 @@ class Entity {
 			key = `${key}${supplied[name]}`;
 		}
 
-		return utilities.formatKeyCasing(key, casing);
+		return u.formatKeyCasing(key, casing);
 	}
 
 	_findBestIndexKeyMatch(attributes = {}) {
@@ -2139,7 +2184,7 @@ class Entity {
 			let indexName = index.index || TableIndex;
 			if (seenIndexes[indexName] !== undefined) {
 				if (indexName === TableIndex) {
-					throw new e.ElectroError(e.ErrorCodes.DuplicateIndexes, `Duplicate index defined in model found in Access Pattern '${accessPattern}': '${utilities.formatIndexNameForDisplay(indexName)}'. This could be because you forgot to specify the index name of a secondary index defined in your model.`);
+					throw new e.ElectroError(e.ErrorCodes.DuplicateIndexes, `Duplicate index defined in model found in Access Pattern '${accessPattern}': '${u.formatIndexNameForDisplay(indexName)}'. This could be because you forgot to specify the index name of a secondary index defined in your model.`);
 				} else {
 					throw new e.ElectroError(e.ErrorCodes.DuplicateIndexes, `Duplicate index defined in model found in Access Pattern '${accessPattern}': '${indexName}'`);
 				}
@@ -2148,7 +2193,7 @@ class Entity {
 			let hasSk = !!index.sk;
 			let inCollection = !!index.collection;
 			if (!hasSk && inCollection) {
-				throw new e.ElectroError(e.ErrorCodes.CollectionNoSK, `Invalid Access pattern definition for '${accessPattern}': '${utilities.formatIndexNameForDisplay(indexName)}', contains a collection definition without a defined SK. Collections can only be defined on indexes with a defined SK.`);
+				throw new e.ElectroError(e.ErrorCodes.CollectionNoSK, `Invalid Access pattern definition for '${accessPattern}': '${u.formatIndexNameForDisplay(indexName)}', contains a collection definition without a defined SK. Collections can only be defined on indexes with a defined SK.`);
 			}
 			let collection = index.collection || "";
 			let customFacets = {
@@ -2219,7 +2264,7 @@ class Entity {
 			if (Array.isArray(sk.facets)) {
 				let duplicates = pk.facets.filter(facet => sk.facets.includes(facet));
 				if (duplicates.length !== 0) {
-					throw new e.ElectroError(e.ErrorCodes.DuplicateIndexCompositeAttributes, `The Access Pattern '${accessPattern}' contains duplicate references the composite attribute(s): ${utilities.commaSeparatedString(duplicates)}. Composite attributes may only be used once within an index. If this leaves the Sort Key (sk) without any composite attributes simply set this to be an empty array.`);
+					throw new e.ElectroError(e.ErrorCodes.DuplicateIndexCompositeAttributes, `The Access Pattern '${accessPattern}' contains duplicate references the composite attribute(s): ${u.commaSeparatedString(duplicates)}. Composite attributes may only be used once within an index. If this leaves the Sort Key (sk) without any composite attributes simply set this to be an empty array.`);
 				}
 			}
 
@@ -2322,13 +2367,13 @@ class Entity {
 
 			let pkTemplateIsCompatible = this._compositeTemplateAreCompatible(parsedPKAttributes, index.pk.composite);
 			if (!pkTemplateIsCompatible) {
-				throw new e.ElectroError(e.ErrorCodes.IncompatibleKeyCompositeAttributeTemplate, `Incompatible PK 'template' and 'composite' properties for defined on index "${utilities.formatIndexNameForDisplay(indexName)}". PK "template" string is defined as having composite attributes ${utilities.commaSeparatedString(parsedPKAttributes.attributes)} while PK "composite" array is defined with composite attributes ${utilities.commaSeparatedString(index.pk.composite)}`);
+				throw new e.ElectroError(e.ErrorCodes.IncompatibleKeyCompositeAttributeTemplate, `Incompatible PK 'template' and 'composite' properties for defined on index "${u.formatIndexNameForDisplay(indexName)}". PK "template" string is defined as having composite attributes ${u.commaSeparatedString(parsedPKAttributes.attributes)} while PK "composite" array is defined with composite attributes ${u.commaSeparatedString(index.pk.composite)}`);
 			}
 
 			if (index.sk !== undefined && Array.isArray(index.sk.composite) && typeof index.sk.template === "string") {
 				let skTemplateIsCompatible = this._compositeTemplateAreCompatible(parsedSKAttributes, index.sk.composite);
 				if (!skTemplateIsCompatible) {
-					throw new e.ElectroError(e.ErrorCodes.IncompatibleKeyCompositeAttributeTemplate, `Incompatible SK 'template' and 'composite' properties for defined on index "${utilities.formatIndexNameForDisplay(indexName)}". SK "template" string is defined as having composite attributes ${utilities.commaSeparatedString(parsedSKAttributes.attributes)} while SK "composite" array is defined with composite attributes ${utilities.commaSeparatedString(index.sk.composite)}`);
+					throw new e.ElectroError(e.ErrorCodes.IncompatibleKeyCompositeAttributeTemplate, `Incompatible SK 'template' and 'composite' properties for defined on index "${u.formatIndexNameForDisplay(indexName)}". SK "template" string is defined as having composite attributes ${u.commaSeparatedString(parsedSKAttributes.attributes)} while SK "composite" array is defined with composite attributes ${u.commaSeparatedString(index.sk.composite)}`);
 				}
 			}
 		}
@@ -2356,7 +2401,7 @@ class Entity {
 
 		for (let [name, fn] of Object.entries(filters)) {
 			if (invalidFilterNames.includes(name)) {
-				throw new e.ElectroError(e.ErrorCodes.InvalidFilter, `Invalid filter name: ${name}. Filter cannot be named ${utilities.commaSeparatedString(invalidFilterNames)}`);
+				throw new e.ElectroError(e.ErrorCodes.InvalidFilter, `Invalid filter name: ${name}. Filter cannot be named ${u.commaSeparatedString(invalidFilterNames)}`);
 			} else {
 				normalized[name] = fn;
 			}
@@ -2475,7 +2520,7 @@ class Entity {
 	_parseModel(model, config = {}) {
 		/** start beta/v1 condition **/
 		const {client} = config;
-		let modelVersion = utilities.getModelVersion(model);
+		let modelVersion = u.getModelVersion(model);
 		let service, entity, version, table, name;
 		switch(modelVersion) {
 			case ModelVersions.beta:

package/src/errors.js

@@ -127,6 +127,18 @@ const ErrorCodes = {
     name: "InvalidIndexCompositeWithAttributeName",
     sym: ErrorCode,
   },
+  InvalidListenerProvided: {
+    code: 1020,
+    section: "invalid-listener-provided",
+    name: "InvalidListenerProvided",
+    sym: ErrorCode,
+  },
+  InvalidClientProvided: {
+    code: 1021,
+    section: "invalid-client-provided",
+    name: "InvalidClientProvided",
+    sym: ErrorCode,
+  },
   MissingAttribute: {
     code: 2001,
     section: "missing-attribute",
@@ -204,7 +216,7 @@ const ErrorCodes = {
     section: "pager-not-unique",
     name: "NoOwnerForPager",
     sym: ErrorCode,
-  },
+  }
 };
 
 function makeMessage(message, section) {

package/src/events.js

@@ -0,0 +1,67 @@
+const e = require("./errors");
+const v = require('./validations');
+
+class EventManager {
+  static createSafeListener(listener) {
+    if (listener === undefined) {
+      return undefined;
+    } if (!v.isFunction(listener)) {
+      throw new e.ElectroError(e.ErrorCodes.InvalidListenerProvided, `Provided listener is not of type 'function'`);
+    } else {
+      return (...params) => {
+        try {
+          listener(...params);
+        } catch(err) {
+          console.error(`Error invoking user supplied listener`, err);
+        }
+      }
+    }
+  }
+
+  static normalizeListeners(listeners = []) {
+    if (!Array.isArray(listeners)) {
+      throw new e.ElectroError(e.ErrorCodes.InvalidListenerProvided, `Listeners must be provided as an array of functions`);
+    }
+    return listeners
+      .map(listener => EventManager.createSafeListener(listener))
+      .filter(listener => {
+        switch (typeof listener) {
+          case 'function':
+            return true;
+          case 'undefined':
+            return false;
+          default:
+            throw new e.ElectroError(e.ErrorCodes.InvalidListenerProvided, `Provided listener is not of type 'function`);
+        }
+      });
+  }
+
+  constructor({listeners = []} = {}) {
+    this.listeners = EventManager.normalizeListeners(listeners);
+  }
+
+  add(listeners = []) {
+    if (!Array.isArray(listeners)) {
+      listeners = [listeners];
+    }
+
+    this.listeners = this.listeners.concat(
+      EventManager.normalizeListeners(listeners)
+    );
+  }
+
+  trigger(event, adHocListeners = []) {
+    const allListeners = [
+      ...this.listeners,
+      ...EventManager.normalizeListeners(adHocListeners)
+    ];
+
+    for (const listener of allListeners) {
+      listener(event);
+    }
+  }
+}
+
+module.exports = {
+  EventManager
+};

package/src/schema.js

@@ -768,21 +768,28 @@ class SetAttribute extends Attribute {
 	_makeSetValidate(definition) {
 		const validate = this._makeValidate(definition.validate);
 		return (value) => {
-			if (Array.isArray(value)) {
-				return validate([...value]);
-			} else if (value && value.wrapperName === 'Set') {
-				return validate([...value.values])
-			} else {
-				return validate(value);
+			switch (getValueType(value)) {
+				case ValueTypes.array:
+					return validate([...value]);
+				case ValueTypes.aws_set:
+					return validate([...value.values]);
+				case ValueTypes.set:
+					return validate(Array.from(value));
+				default:
+					return validate(value);
 			}
 		}
 	}
 
 	fromDDBSet(value) {
-		if (getValueType(value) === ValueTypes.aws_set) {
-			return value.values;
+		switch (getValueType(value)) {
+			case ValueTypes.aws_set:
+				return [...value.values];
+			case ValueTypes.set:
+				return Array.from(value);
+			default:
+				return value;
 		}
-		return value;
 	}
 
 	_createDDBSet(value) {
@@ -820,15 +827,14 @@ class SetAttribute extends Attribute {
 
 	_makeGet(get, items) {
 		this._checkGetSet(get, "get");
-
 		const getter = get || ((attr) => attr);
-
 		return (values, siblings) => {
 			if (values !== undefined) {
 				const data = this.fromDDBSet(values);
 				return getter(data, siblings);
 			}
-			let results = getter(data, siblings);
+			const data = this.fromDDBSet(values);
+			const results = getter(data, siblings);
 			if (results !== undefined) {
 				// if not undefined, try to convert, else no need to return
 				return this.fromDDBSet(results);
@@ -840,9 +846,7 @@ class SetAttribute extends Attribute {
 		this._checkGetSet(set, "set");
 		const setter = set || ((attr) => attr);
 		return (values, siblings) => {
-			const results = values && values.wrapperName === 'Set'
-				? setter(values.values, siblings)
-				: setter(values, siblings)
+			const results = setter(this.fromDDBSet(values), siblings);
 			if (results !== undefined) {
 				return this.toDDBSet(results);
 			}
@@ -879,7 +883,7 @@ class SetAttribute extends Attribute {
 		} else {
 			errors.push(
 				new e.ElectroAttributeValidationError(this.path, `Invalid value type at attribute path: "${this.path}". Expected value to be an Expected value to be an Array, native JavaScript Set objects, or DocumentClient Set objects to fulfill attribute type "${this.type}"`)
-			)
+			);
 		}
 		for (const item of arr) {
 			const [isValid, errorValues] = this.items.isValid(item);

package/src/service.js

@@ -6,6 +6,7 @@ const { FilterOperations } = require("./operations");
 const { WhereFactory } = require("./where");
 const { getInstanceType, getModelVersion, applyBetaModelOverrides } = require("./util");
 const v = require("./validations");
+const c = require('./client');
 const e = require("./errors");
 const u = require("./util");
 
@@ -58,6 +59,9 @@ class Service {
 
 		this.config = config;
 		this.client = config.client;
+		if (v.isFunction(config.logger)) {
+			this.logger = config.logger;
+		}
 		this.entities = {};
 		this.find = {};
 		this.collectionSchema = {};
@@ -79,6 +83,9 @@ class Service {
 
 		this.config = config;
 		this.client = config.client;
+		if (v.isFunction(config.logger)) {
+			this.logger = config.logger;
+		}
 		this.entities = {};
 		this.find = {};
 		this.collectionSchema = {};
@@ -98,6 +105,7 @@ class Service {
 	}
 
 	constructor(service = "", config = {}) {
+		config = c.normalizeConfig(config);
 		this.version = ServiceVersions.v1;
 		let type = inferConstructorType(service);
 		switch(type) {

package/src/types.js

@@ -179,7 +179,12 @@ const KeyCasing = {
 	upper: "upper",
 	lower: "lower",
 	default: "default",
-}
+};
+
+const EventSubscriptionTypes = [
+	"query",
+	"results"
+];
 
 module.exports = {
 	Pager,
@@ -208,5 +213,6 @@ module.exports = {
 	FormatToReturnValues,
 	AttributeProxySymbol,
 	ElectroInstanceTypes,
+	EventSubscriptionTypes,
 	AttributeMutationMethods
 };

package/src/util.js

@@ -1,5 +1,6 @@
-const v = require("./validations");
 const t = require("./types");
+const e = require("./errors");
+const v = require("./validations");
 
 function parseJSONPath(path = "") {
   if (typeof path !== "string") {