electrodb 3.7.0 → 3.7.2

package/index.d.ts

@@ -2632,6 +2632,7 @@ export interface QueryOptions {
   data?: "raw" | "includeKeys" | "attributes";
   order?: "asc" | "desc";
   consistent?: boolean;
+  client?: DocumentClient;
 }
 
 // subset of QueryOptions
@@ -2721,6 +2722,7 @@ interface GoBatchGetTerminalOptions<Attributes> {
   listeners?: Array<ElectroEventListener>;
   logger?: ElectroEventListener;
   consistent?: boolean;
+  client?: DocumentClient;
 }
 
 export type ExecutionOptionCompare = "keys" | "attributes" | "v2";
@@ -2752,6 +2754,7 @@ type ServiceQueryGoTerminalOptions<
   logger?: ElectroEventListener;
   order?: "asc" | "desc";
   consistent?: boolean;
+  client?: DocumentClient;
 } & QueryExecutionComparisonParts &
   (
     | {
@@ -2820,6 +2823,7 @@ type GoQueryTerminalOptions<
   order?: "asc" | "desc";
   hydrate?: boolean;
   consistent?: boolean;
+  client?: DocumentClient;
 } & QueryExecutionComparisonParts &
   (
     | {
@@ -2847,6 +2851,7 @@ interface TransactWriteQueryOptions {
   listeners?: Array<ElectroEventListener>;
   logger?: ElectroEventListener;
   response?: "all_old";
+  client?: DocumentClient;
 }
 
 interface TransactGetQueryOptions<Attributes> {
@@ -2859,6 +2864,7 @@ interface TransactGetQueryOptions<Attributes> {
   listeners?: Array<ElectroEventListener>;
   logger?: ElectroEventListener;
   consistent?: boolean;
+  client?: DocumentClient;
 }
 
 export type ParamTerminalOptions<Attributes> = {
@@ -5899,9 +5905,14 @@ export class TransactGetEntity<
 type TransactWriteFunctionOptions = {
   token?: string;
   logger?: ElectroEventListener;
+  client?: DocumentClient;
 };
 
-type TransactGetFunctionOptions = {};
+type TransactGetFunctionOptions = {
+  token?: string;
+  logger?: ElectroEventListener;
+  client?: DocumentClient;
+};
 
 type TransactWriteExtractedType<
   T extends readonly any[],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electrodb",
-  "version": "3.7.0",
+  "version": "3.7.2",
   "description": "A library to more easily create and interact with multiple entities and heretical relationships in dynamodb",
   "main": "index.js",
   "scripts": {

package/src/clauses.js

@@ -1358,10 +1358,10 @@ let clauses = {
         return Promise.reject(state.error);
       }
       try {
-        if (entity.client === undefined) {
+        if (entity.client === undefined && options.client === undefined) {
           throw new e.ElectroError(
             e.ErrorCodes.NoClientDefined,
-            "No client defined on model",
+            "No client defined on model or provided in query options",
           );
         }
         options.terminalOperation = TerminalOperation.go;

package/src/entity.js

@@ -516,7 +516,8 @@ class Entity {
       );
     };
     const dynamoDBMethod = MethodTypeTranslation[method];
-    return this.client[dynamoDBMethod](params)
+    const client = config.client || this.client;
+    return client[dynamoDBMethod](params)
       .promise()
       .then((results) => {
         notifyQuery();
@@ -920,6 +921,8 @@ class Entity {
   is(item, config) {
     return (
       config.ignoreOwnership &&
+      config.attributes &&
+      config.attributes.length > 0 &&
       !this._itemIncludesKeys(item)
     ) || (
       (config.ignoreOwnership || config.hydrate) &&
@@ -1018,8 +1021,8 @@ class Entity {
       return null;
     }
     const config = {
-      ...(options || {}),
       ignoreOwnership: true,
+      ...(options || {}),
     };
     return this.formatResponse(item, TableIndex, config);
   }
@@ -1931,6 +1934,10 @@ class Entity {
         config.hydrator = option.hydrator;
       }
 
+      if (option.client !== undefined) {
+        config.client = c.normalizeClient(option.client);
+      }
+
       if (option._includeOnResponseItem) {
         config._includeOnResponseItem = {
           ...config._includeOnResponseItem,
@@ -2762,7 +2769,7 @@ class Entity {
       let is = {}
       let start = {}
       let end = {};
-      (state.query.keys.sk ?? []).forEach(({type, facets}) => {
+      (state.query.keys.sk || []).forEach(({type, facets}) => {
         if (type === QueryTypes.is || type === QueryTypes.composite_collection) {
           is = facets;
         } else if (type === QueryTypes.between) {