@webiny/db-dynamodb 5.18.2 → 5.19.0-beta.1

package/BatchProcess.d.ts

@@ -26,6 +26,6 @@ declare class BatchProcess {
     addBatchDelete(args: any): () => any;
     addBatchGet(args: any): () => any;
     allOperationsAdded(): boolean;
-    startExecution(): import("aws-sdk/lib/request").Request<DocumentClient.BatchGetItemOutput, import("aws-sdk/lib/error").AWSError> | import("aws-sdk/lib/request").Request<DocumentClient.BatchWriteItemOutput, import("aws-sdk/lib/error").AWSError>;
+    startExecution(): import("aws-sdk/lib/request").Request<DocumentClient.BatchWriteItemOutput, import("aws-sdk/lib/error").AWSError> | import("aws-sdk/lib/request").Request<DocumentClient.BatchGetItemOutput, import("aws-sdk/lib/error").AWSError>;
 }
 export default BatchProcess;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/db-dynamodb",
-	"version": "5.18.2",
+	"version": "5.19.0-beta.1",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -10,11 +10,11 @@
 	"author": "Webiny Ltd",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/db": "5.18.2",
-		"@webiny/error": "5.18.2",
-		"@webiny/handler": "5.18.2",
-		"@webiny/handler-db": "5.18.2",
-		"@webiny/plugins": "5.18.2",
+		"@webiny/db": "5.19.0-beta.1",
+		"@webiny/error": "5.19.0-beta.1",
+		"@webiny/handler": "5.19.0-beta.1",
+		"@webiny/handler-db": "5.19.0-beta.1",
+		"@webiny/plugins": "5.19.0-beta.1",
 		"date-fns": "2.25.0",
 		"dot-prop": "6.0.1",
 		"fuse.js": "6.4.6",
@@ -24,8 +24,8 @@
 	"devDependencies": {
 		"@babel/cli": "^7.5.5",
 		"@babel/core": "^7.5.5",
-		"@webiny/cli": "^5.18.2",
-		"@webiny/project-utils": "^5.18.2",
+		"@webiny/cli": "^5.19.0-beta.1",
+		"@webiny/project-utils": "^5.19.0-beta.1",
 		"dynamodb-toolbox": "^0.3.4",
 		"jest": "^26.6.3",
 		"jest-dynalite": "^3.2.0",
@@ -41,5 +41,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "9b14763c1769d89fd0fae96da00e6221d527595f"
+	"gitHead": "dd406fbad0620ecce47063e9afbff40c502c3844"
 }

package/plugins/filters/eq.js

@@ -13,6 +13,19 @@ var _default = new _ValueFilterPlugin.ValueFilterPlugin({
     value,
     compareValue
   }) => {
+    /**
+     * Possibility that either input value or one from the system is array.
+     */
+    if (Array.isArray(value) === true) {
+      return value.some(v => {
+        return Array.isArray(compareValue) ? compareValue.includes(v) : compareValue === v;
+      });
+    } else if (Array.isArray(compareValue) === true) {
+      return compareValue.every(v => {
+        return value === v;
+      });
+    }
+
     return value === compareValue;
   }
 });

package/utils/batchRead.d.ts

@@ -11,5 +11,5 @@ interface Params {
  * This helper function is meant to be used to batch read from one table.
  * It will fetch all results, as there is a next() method call built in.
  */
-export declare const batchReadAll: <T = any>(params: Params) => Promise<T[]>;
+export declare const batchReadAll: <T = any>(params: Params, maxChunk?: number) => Promise<T[]>;
 export {};

package/utils/batchRead.js

@@ -1,10 +1,18 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.batchReadAll = void 0;
 
+var _chunk = _interopRequireDefault(require("lodash/chunk"));
+
+var _error = _interopRequireDefault(require("@webiny/error"));
+
+const MAX_BATCH_ITEMS = 100;
+
 const flatten = responses => {
   const entries = [];
   const values = Object.values(responses);
@@ -15,44 +23,67 @@ const flatten = responses => {
 
   return entries;
 };
-/**
- * This helper function is meant to be used to batch read from one table.
- * It will fetch all results, as there is a next() method call built in.
- */
 
+const batchReadAllChunk = async params => {
+  const {
+    table,
+    items
+  } = params;
+  const records = [];
+  const result = await table.batchGet(items);
 
-const batchReadAll = async params => {
-  if (params.items.length === 0) {
-    return [];
+  if (!result || !result.Responses) {
+    return records;
   }
 
-  const items = [];
-  const result = await params.table.batchGet(params.items);
+  records.push(...flatten(result.Responses));
 
-  if (result.Responses) {
-    items.push(...flatten(result.Responses));
+  if (!result.next || typeof result.next !== "function") {
+    return records;
   }
 
-  if (typeof result.next === "function") {
-    let previous = result;
-    let nextResult;
+  let previous = result;
 
-    while (nextResult = await previous.next()) {
-      if (!nextResult) {
-        return items;
-      }
+  while (typeof previous.next === "function") {
+    const nextResult = await previous.next();
 
-      items.push(...flatten(nextResult.Responses));
+    if (!nextResult) {
+      return records;
+    }
 
-      if (!nextResult || typeof nextResult.next !== "function") {
-        return items;
-      }
+    records.push(...flatten(nextResult.Responses));
+    previous = nextResult;
+  }
 
-      previous = nextResult;
-    }
+  return records;
+};
+/**
+ * This helper function is meant to be used to batch read from one table.
+ * It will fetch all results, as there is a next() method call built in.
+ */
+
+
+const batchReadAll = async (params, maxChunk = MAX_BATCH_ITEMS) => {
+  if (params.items.length === 0) {
+    return [];
+  } else if (maxChunk > MAX_BATCH_ITEMS) {
+    throw new _error.default(`Cannot set to load more than ${MAX_BATCH_ITEMS} items from the DynamoDB at once.`, "DYNAMODB_MAX_BATCH_GET_LIMIT_ERROR", {
+      maxChunk
+    });
+  }
+
+  const records = [];
+  const chunkItemsList = (0, _chunk.default)(params.items, maxChunk);
+
+  for (const chunkItems of chunkItemsList) {
+    const results = await batchReadAllChunk({
+      table: params.table,
+      items: chunkItems
+    });
+    records.push(...results);
   }
 
-  return items;
+  return records;
 };
 
 exports.batchReadAll = batchReadAll;